Skip to content

Commit 0077982

Browse files
authoredApr 18, 2021
GLES fixes (#11205)
* Consistently set float precision for GLES * Enable DPI scaling on Windows+GLES
1 parent 623f0a8 commit 0077982

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed
 

‎src/client/renderingengine.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,10 @@ static bool getWindowHandle(irr::video::IVideoDriver *driver, HWND &hWnd)
335335
case video::EDT_DIRECT3D9:
336336
hWnd = reinterpret_cast<HWND>(exposedData.D3D9.HWnd);
337337
break;
338+
#if ENABLE_GLES
339+
case video::EDT_OGLES1:
340+
case video::EDT_OGLES2:
341+
#endif
338342
case video::EDT_OPENGL:
339343
hWnd = reinterpret_cast<HWND>(exposedData.OpenGLWin32.HWnd);
340344
break;

‎src/client/shader.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -579,8 +579,10 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
579579
if (use_gles) {
580580
shaders_header << R"(
581581
#version 100
582-
)";
582+
)";
583583
vertex_header = R"(
584+
precision mediump float;
585+
584586
uniform highp mat4 mWorldView;
585587
uniform highp mat4 mWorldViewProj;
586588
uniform mediump mat4 mTexture;
@@ -592,17 +594,17 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
592594
attribute mediump vec3 inVertexNormal;
593595
attribute mediump vec4 inVertexTangent;
594596
attribute mediump vec4 inVertexBinormal;
595-
)";
597+
)";
596598
fragment_header = R"(
597599
precision mediump float;
598-
)";
600+
)";
599601
} else {
600602
shaders_header << R"(
601603
#version 120
602604
#define lowp
603605
#define mediump
604606
#define highp
605-
)";
607+
)";
606608
vertex_header = R"(
607609
#define mWorldView gl_ModelViewMatrix
608610
#define mWorldViewProj gl_ModelViewProjectionMatrix
@@ -615,7 +617,7 @@ ShaderInfo ShaderSource::generateShader(const std::string &name,
615617
#define inVertexNormal gl_Normal
616618
#define inVertexTangent gl_MultiTexCoord1
617619
#define inVertexBinormal gl_MultiTexCoord2
618-
)";
620+
)";
619621
}
620622

621623
bool use_discard = use_gles;

0 commit comments

Comments
 (0)
Please sign in to comment.