diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-11-22 11:21:21 -0800 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-11-22 11:21:21 -0800 |
| commit | 1103e66f2487bdb4f19162b47d963d8eecf13364 (patch) | |
| tree | b74716f7e9db7447f206ff504adfcdad44236964 | |
| parent | 682737c5efe1b8b2da8060b1f39b01ae82e10534 (diff) | |
Revert "texture-integer-glsl130: Expect 1 for alpha in R, RG, RGB cases."
This reverts commit cf47699087f74a6fd94c59a74837fc6c3c6422a8.
While I still believe the test is wrong, apparently this change made it
worse; the test doesn't quite work like I thought. More investigation
is needed. In the meantime, restore the old behavior.
| -rw-r--r-- | tests/spec/ext_texture_integer/texture-integer-glsl130.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/spec/ext_texture_integer/texture-integer-glsl130.c b/tests/spec/ext_texture_integer/texture-integer-glsl130.c index 4d59c520..17b02bcc 100644 --- a/tests/spec/ext_texture_integer/texture-integer-glsl130.c +++ b/tests/spec/ext_texture_integer/texture-integer-glsl130.c @@ -373,9 +373,10 @@ test_format(const struct format_info *info) value[0] = temp; break; case GL_RGB_INTEGER_EXT: + expected[3] = 0.0; break; case GL_RG_INTEGER: - expected[2] = 0.0; + expected[2] = expected[3] = 0.0; break; case GL_ALPHA_INTEGER_EXT: expected[0] = expected[1] = expected[2] = 0.0; @@ -403,7 +404,7 @@ test_format(const struct format_info *info) expected[0] = expected[1] = expected[2] = expected[3] = 0.25; value[1] = value[2] = value[3] = value[0]; } else { - expected[1] = expected[2] = 0.0; + expected[1] = expected[2] = expected[3] = 0.0; } break; default: |