diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2015-01-19 10:59:27 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2015-01-30 09:39:24 +0200 |
| commit | 1d767eb7565723148746d462ac936a5aa3afb28b (patch) | |
| tree | 97e4aa40172a72a754b2026dfa456affd7e4fe5f | |
| parent | 9f6b6cf1a5308308c96997eb12609827929a11c7 (diff) | |
sso: consume error in active-sampler-conflict
Test currently fails because INVALID_OPERATION generated by
program_pipeline_check_status is not read and piglit_check_gl_error
is called for another call later. This change makes the test pass as
expected.
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
| -rw-r--r-- | tests/spec/arb_separate_shader_objects/active-sampler-conflict.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c b/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c index e4c6800b8..538844902 100644 --- a/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c +++ b/tests/spec/arb_separate_shader_objects/active-sampler-conflict.c @@ -174,6 +174,8 @@ void piglit_init(int argc, char **argv) pass = false; } + pass = piglit_check_gl_error(GL_INVALID_OPERATION) && pass; + /* Switch back to the valid configuration. Without first calling * glValidateProgramPipeline, try to draw something. Verify that * no error is generated. |