[Piglit] [PATCH] mesa/main: texture_image_multisample needs to pass OpenGL3.3 conformance test.

Marius Predut marius.predut at intel.com
Wed Nov 25 03:43:31 PST 2015


Open GL 3.3 reference document says:
	samples must be in the range zero to GL_MAX_TEXTURE_SIZE - 1.
Open GL.4 clearly states:
	An INVALID_VALUE error is generated if samples is zero.

Rollback applied patch
http://lists.freedesktop.org/archives/piglit/2015-August/016817.html
commit	b4b8c87ea78a53673c52d06af5abb5b7b263ddc9

Bugzilla:
	https://bugs.freedesktop.org/show_bug.cgi?id=93100
	https://bugs.freedesktop.org/show_bug.cgi?id=91670
	https://bugs.freedesktop.org/show_bug.cgi?id=91670

Signed-off-by: Marius Predut <marius.predut at intel.com>
---
 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;
 	}
-- 
1.9.1



More information about the Piglit mailing list