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 <[email protected]> --- tests/spec/arb_separate_shader_objects/active-sampler-conflict.c | 2 ++ 1 file changed, 2 insertions(+) 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 e4c6800..5388449 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. -- 2.1.0 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
