From 26504031ff9a525be0db3535af2b0dfa42cb87c4 Mon Sep 17 00:00:00 2001 From: rogerman Date: Mon, 14 Jan 2019 15:17:13 -0800 Subject: [PATCH] OpenGL Renderer: Partially revert commit 0f045d4 -- don't do the Z adjust in the vertex shader. Apparently, we shouldn't need to explicitly do this in OpenGL, as this adjustment should be automatic. Fixes a graphical glitch that can occur in "Sonic Chronicles: The Dark Brotherhood". --- desmume/src/OGLRender.cpp | 3 +-- desmume/src/OGLRender_3_2.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/desmume/src/OGLRender.cpp b/desmume/src/OGLRender.cpp index c23afbeab..942ed4668 100755 --- a/desmume/src/OGLRender.cpp +++ b/desmume/src/OGLRender.cpp @@ -294,8 +294,7 @@ void main() \n\ \n\ vtxTexCoord = texScaleMtx * inTexCoord0; \n\ vtxColor = vec4(inColor / 63.0, polyAlpha); \n\ - gl_Position.xyw = inPosition.xyw;\n\ - gl_Position.z = (inPosition.z + inPosition.w) / 2.0;\n\ + gl_Position = inPosition;\n\ } \n\ "}; diff --git a/desmume/src/OGLRender_3_2.cpp b/desmume/src/OGLRender_3_2.cpp index d6a57a410..36d04fe27 100755 --- a/desmume/src/OGLRender_3_2.cpp +++ b/desmume/src/OGLRender_3_2.cpp @@ -146,8 +146,7 @@ void main()\n\ \n\ vtxTexCoord = texScaleMtx * inTexCoord0;\n\ vtxColor = vec4(inColor / 63.0, polyAlpha);\n\ - gl_Position.xyw = inPosition.xyw;\n\ - gl_Position.z = (inPosition.z + inPosition.w) / 2.0;\n\ + gl_Position = inPosition;\n\ }\n\ "};