Maybe also mention in commit message that we are updating test here according to how OpenGL >=4.2 defines things. I've checked that 4.2 spec looks to be the first to mention:

"if samples is zero, an INVALID_VALUE error is generated."

I see that the format change is done because ConvertMultiSample2DToTexture2D uses create_bind_texture which happens to use GL_RGBA for generating the dst texture.

Reviewed-by: Tapani Pälli <[email protected]>


On 08/18/2015 07:42 AM, Timothy Arceri wrote:
Samples must be greater than 0 and color formats must match.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91670
---
  tests/spec/gl-3.2/layered-rendering/framebuffertexture.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c 
b/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c
index d6eef1e..88599de 100644
--- a/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c
+++ b/tests/spec/gl-3.2/layered-rendering/framebuffertexture.c
@@ -137,10 +137,10 @@ create_bind_texture(GLenum textureType) {
                }
                break;
        case GL_TEXTURE_2D_MULTISAMPLE:
-               glTexImage2DMultisample(textureType, 0, GL_RGB, 6, 6, GL_FALSE);
+               glTexImage2DMultisample(textureType, 1, GL_RGBA, 6, 6, 
GL_FALSE);
                break;
        case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
-               glTexImage3DMultisample(textureType, 0, GL_RGB,
+               glTexImage3DMultisample(textureType, 1, GL_RGBA,
                                        6, 6, 6, GL_FALSE);
                break;
        }

_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit

Reply via email to