[Piglit] [PATCH 1/2] textureSize/texelFetch: relax version requirement

Chris Forbes chrisf at ijw.co.nz
Wed Jul 17 02:59:38 PDT 2013


Allow GLSL 1.30 + GL 2.1 + EXT_gpu_shader4.

Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
---
 tests/texturing/shaders/common.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/texturing/shaders/common.c b/tests/texturing/shaders/common.c
index dba578a..b48ad4c 100644
--- a/tests/texturing/shaders/common.c
+++ b/tests/texturing/shaders/common.c
@@ -346,7 +346,10 @@ require_GL_features(enum shader_target test_stage)
 		break;
 	case GL_RGBA32UI:
 	case GL_RGBA16UI:
-		piglit_require_gl_version(30);
+		if (piglit_is_extension_supported("GL_EXT_gpu_shader4"))
+			piglit_require_gl_version(21);
+		else
+			piglit_require_gl_version(30);
 		break;
 	case GL_RGBA32F:
 	case GL_RGBA16F:
@@ -364,7 +367,10 @@ require_GL_features(enum shader_target test_stage)
 		break;
 	case GL_TEXTURE_CUBE_MAP:
 		if (is_shadow_sampler())
-			piglit_require_gl_version(30);
+			if (piglit_is_extension_supported("GL_EXT_gpu_shader4"))
+				piglit_require_gl_version(21);
+			else
+				piglit_require_gl_version(30);
 		break;
 	case GL_TEXTURE_RECTANGLE:
 		piglit_require_extension("GL_ARB_texture_rectangle");
-- 
1.8.3.2



More information about the Piglit mailing list