Merge pull request #12227 from hrydgard/range-cull-aggressive

Vulkan/GL: Set all four coordinates to NaN instead of just W.
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2019-08-09 00:09:51 +02:00
commit 3b4e37145f
2 files changed
+2 -5

No files matched your search

+1 -1
View File
@@ -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");
}
+1 -4
View File
@@ -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");
}