[Piglit] [PATCH] arb_shader_storage_buffer_object: add missing GLSL versions.

Dave Airlie airlied at gmail.com
Tue Jan 26 19:44:10 PST 2016


From: Dave Airlie <airlied at redhat.com>

No GLSL version implies GLSL 1.10, but that isn't supported by
fglrx in core profiles.

This lets the tests run and fail in more interesting ways on fglrx.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 tests/spec/arb_shader_storage_buffer_object/max-ssbo-size.c | 2 ++
 tests/spec/arb_shader_storage_buffer_object/maxblocks.c     | 1 +
 tests/spec/arb_shader_storage_buffer_object/rendering.c     | 1 +
 tests/spec/arb_shader_storage_buffer_object/ssbo-binding.c  | 1 +
 4 files changed, 5 insertions(+)

diff --git a/tests/spec/arb_shader_storage_buffer_object/max-ssbo-size.c b/tests/spec/arb_shader_storage_buffer_object/max-ssbo-size.c
index 4595349..154e1af 100644
--- a/tests/spec/arb_shader_storage_buffer_object/max-ssbo-size.c
+++ b/tests/spec/arb_shader_storage_buffer_object/max-ssbo-size.c
@@ -76,6 +76,7 @@ piglit_display(void)
 		"}\n";
 
 	const char *fs_template =
+		"#version 130\n"
 		"#extension GL_ARB_shader_storage_buffer_object : enable\n"
 		"\n"
 		"varying vec4 vary;"
@@ -94,6 +95,7 @@ piglit_display(void)
 		"}\n";
 
 	const char *fs_ssbo_template =
+		"#version 130\n"
 		"#extension GL_ARB_shader_storage_buffer_object : enable\n"
 		"#extension GL_ARB_uniform_buffer_object : enable\n"
 		"\n"
diff --git a/tests/spec/arb_shader_storage_buffer_object/maxblocks.c b/tests/spec/arb_shader_storage_buffer_object/maxblocks.c
index cd9bc47..b03f653 100644
--- a/tests/spec/arb_shader_storage_buffer_object/maxblocks.c
+++ b/tests/spec/arb_shader_storage_buffer_object/maxblocks.c
@@ -73,6 +73,7 @@ get_shader(GLenum target, const char *block_prefix, int blocks)
 		"	v = vec4(0)%s;\n"
 		"}\n";
 	const char *fs_source =
+		"#version 130\n"
 		"#extension GL_ARB_shader_storage_buffer_object : enable\n"
 		"#extension GL_ARB_uniform_buffer_object : enable\n"
 		"\n"
diff --git a/tests/spec/arb_shader_storage_buffer_object/rendering.c b/tests/spec/arb_shader_storage_buffer_object/rendering.c
index 8d4ecdf..52d5882 100644
--- a/tests/spec/arb_shader_storage_buffer_object/rendering.c
+++ b/tests/spec/arb_shader_storage_buffer_object/rendering.c
@@ -58,6 +58,7 @@ static const char vert_shader_text[] =
 	"}\n";
 
 static const char frag_shader_text[] =
+	"#version 130\n"
 	"#extension GL_ARB_shader_storage_buffer_object : require\n"
 	"\n"
 	"buffer ssbo_color { vec4 color; float color_scale; };\n"
diff --git a/tests/spec/arb_shader_storage_buffer_object/ssbo-binding.c b/tests/spec/arb_shader_storage_buffer_object/ssbo-binding.c
index 6e20de0..062f71e 100644
--- a/tests/spec/arb_shader_storage_buffer_object/ssbo-binding.c
+++ b/tests/spec/arb_shader_storage_buffer_object/ssbo-binding.c
@@ -53,6 +53,7 @@ PIGLIT_GL_TEST_CONFIG_END
 static GLuint prog;
 
 static const char frag_shader_text[] =
+	"#version 130\n"
 	"#extension GL_ARB_shader_storage_buffer_object : require\n"
 	"\n"
 	"buffer ssbo_a { vec4 a; };\n"
-- 
2.1.0



More information about the Piglit mailing list