From caabc9023f5b3e03be69bab45ec354792146b28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 8 Aug 2019 23:13:47 +0200 Subject: [PATCH 1/2] Vulkan: Set all four coordinates to NaN instead of just W. Fixes range culling on ARM. Fixes #11999. --- GPU/Vulkan/VertexShaderGeneratorVulkan.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp b/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp index c6aa3644bd52..88382f3b81a1 100644 --- a/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp +++ b/GPU/Vulkan/VertexShaderGeneratorVulkan.cpp @@ -47,9 +47,6 @@ static const char *vulkan_glsl_preamble = // texcoord = 2 // fog = 3 - - - #undef WRITE #define WRITE p+=sprintf @@ -634,7 +631,7 @@ bool GenerateVulkanGLSLVertexShader(const VShaderID &id, char *buffer) { const char *outMin = "projPos.x < base.cullRangeMin.x || projPos.y < base.cullRangeMin.y || projPos.z < base.cullRangeMin.z"; const char *outMax = "projPos.x > base.cullRangeMax.x || projPos.y > base.cullRangeMax.y || projPos.z > base.cullRangeMax.z"; WRITE(p, " if (%s || %s) {\n", outMin, outMax); - WRITE(p, " outPos.w = base.cullRangeMax.w;\n"); + WRITE(p, " outPos.xyzw = vec4(base.cullRangeMax.w);\n"); WRITE(p, " }\n"); WRITE(p, " }\n"); } From 09b55468286c31a8a49e38ba487073e2364abbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 9 Aug 2019 00:09:06 +0200 Subject: [PATCH 2/2] Apply the same Mali range culling "fix" in OpenGL. --- GPU/GLES/VertexShaderGeneratorGLES.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPU/GLES/VertexShaderGeneratorGLES.cpp b/GPU/GLES/VertexShaderGeneratorGLES.cpp index f8193617e0e2..3bbec79002f5 100644 --- a/GPU/GLES/VertexShaderGeneratorGLES.cpp +++ b/GPU/GLES/VertexShaderGeneratorGLES.cpp @@ -842,7 +842,7 @@ void GenerateVertexShader(const VShaderID &id, char *buffer, uint32_t *attrMask, const char *outMin = "projPos.x < u_cullRangeMin.x || projPos.y < u_cullRangeMin.y || projPos.z < u_cullRangeMin.z"; const char *outMax = "projPos.x > u_cullRangeMax.x || projPos.y > u_cullRangeMax.y || projPos.z > u_cullRangeMax.z"; WRITE(p, " if (%s || %s) {\n", outMin, outMax); - WRITE(p, " outPos.w = u_cullRangeMax.w;\n"); + WRITE(p, " outPos.xyzw = vec4(u_cullRangeMax.w);\n"); WRITE(p, " }\n"); WRITE(p, " }\n"); }