summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-01-04 11:20:35 -0700
committerBrian Paul <brianp@vmware.com>2011-02-15 12:40:38 -0700
commit55d78c07525703b70a22e400fd3b38bbca44c079 (patch)
tree3f27966f93518e44ae07b8152ecdebb9c952f79a
parent95311553470f2c532776c252a3936eb200bcfcf7 (diff)
glsl1: better comments for shadow2D() tests
-rw-r--r--src/glean/tglsl1.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/glean/tglsl1.cpp b/src/glean/tglsl1.cpp
index 8f2ceae..09284f3 100644
--- a/src/glean/tglsl1.cpp
+++ b/src/glean/tglsl1.cpp
@@ -2361,7 +2361,7 @@ static const ShaderProgram Programs[] = {
" vec3 coord = vec3(0.1, 0.1, 0.5); \n"
" // shadow map value should be 0.25 \n"
" gl_FragColor = shadow2D(texZ, coord) + vec4(0.25); \n"
- " // 0.5 <= 0.25 ? color = 1 : 0\n"
+ " // color = (0.5 <= 0.25) ? 1.25 : 0.25\n"
"} \n",
{ 0.25, 0.25, 0.25, 1.0 },
DONT_CARE_Z,
@@ -2376,7 +2376,7 @@ static const ShaderProgram Programs[] = {
" vec3 coord = vec3(0.1, 0.1, 0.2); \n"
" // shadow map value should be 0.25 \n"
" gl_FragColor = shadow2D(texZ, coord); \n"
- " // 0.2 <= 0.25 ? color = 1 : 0\n"
+ " // color = (0.2 <= 0.25) ? 1 : 0\n"
"} \n",
{ 1.0, 1.0, 1.0, 1.0 },
DONT_CARE_Z,
@@ -2391,7 +2391,7 @@ static const ShaderProgram Programs[] = {
" vec3 coord = vec3(0.9, 0.9, 0.95); \n"
" // shadow map value should be 0.75 \n"
" gl_FragColor = shadow2D(texZ, coord) + vec4(0.25); \n"
- " // 0.95 <= 0.75 ? color = 1 : 0\n"
+ " // color = (0.95 <= 0.75) ? 1.25 : 0.25\n"
"} \n",
{ 0.25, 0.25, 0.25, 1.0 },
DONT_CARE_Z,
@@ -2406,7 +2406,7 @@ static const ShaderProgram Programs[] = {
" vec3 coord = vec3(0.9, 0.9, 0.65); \n"
" // shadow map value should be 0.75 \n"
" gl_FragColor = shadow2D(texZ, coord); \n"
- " // 0.65 <= 0.75 ? color = 1 : 0\n"
+ " // color = (0.65 <= 0.75) ? 1 : 0\n"
"} \n",
{ 1.0, 1.0, 1.0, 1.0 },
DONT_CARE_Z,
@@ -4342,6 +4342,7 @@ GLSLTest::setupTextures(void)
//
// 2D GL_DEPTH_COMPONENT texture (for shadow sampler tests)
+ // Left half = 0.25, right half = 0.75
//
for (i = 0; i < 16; i++) {
for (j = 0; j < 16; j++) {
@@ -4770,6 +4771,8 @@ GLSLTest::testProgram(const ShaderProgram &p)
glEnd();
}
+ // env->log << " Shader test: " << p.name << "\n";
+
// read a pixel from lower-left corder of rendered quad
GLfloat pixel[4];
glReadPixels(windowSize / 2 - 2, windowSize / 2 - 2, 1, 1,