>From the GL 3.0 spec, section 4.3.3, in the documentation for
CopyPixels():
"An INVALID_OPERATION error will be generated if the object bound
to READ_FRAMEBUFFER_BINDING is framebuffer complete and the value
of SAMPLE_BUFFERS is greater than zero."
The same applies to CopyTexImage...() and CopyTexSubImage...()
functions, since they are defined in terms of CopyPixels().
Previously we were checking for an INVALID_FRAMEBUFFER_OPERATION error
in these cases.
---
.../negative-copypixels.c | 2 +-
.../negative-copyteximage.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c
b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c
index 6b0e984..ff90539 100644
--- a/tests/spec/ext_framebuffer_multisample/negative-copypixels.c
+++ b/tests/spec/ext_framebuffer_multisample/negative-copypixels.c
@@ -90,7 +90,7 @@ piglit_init(int argc, char **argv)
/* Finally, the actual test! */
glCopyPixels(0, 0, 1, 1, GL_COLOR);
- if (!piglit_check_gl_error(GL_INVALID_FRAMEBUFFER_OPERATION))
+ if (!piglit_check_gl_error(GL_INVALID_OPERATION))
piglit_report_result(PIGLIT_FAIL);
glDeleteRenderbuffersEXT(1, &rb);
diff --git a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c
b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c
index 06bcadb..ee37bed 100644
--- a/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c
+++ b/tests/spec/ext_framebuffer_multisample/negative-copyteximage.c
@@ -93,7 +93,7 @@ piglit_init(int argc, char **argv)
/* Finally, the actual test! */
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 0, 0, 1, 1, 0);
- if (!piglit_check_gl_error(GL_INVALID_FRAMEBUFFER_OPERATION))
+ if (!piglit_check_gl_error(GL_INVALID_OPERATION))
piglit_report_result(PIGLIT_FAIL);
glDeleteTextures(1, &tex);
--
1.7.7.6
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
