[Piglit] [PATCH] arb_enhanced_layouts: fix offset link tests to work with GLSL 1.40

Timothy Arceri timothy.arceri at collabora.com
Tue Dec 29 17:32:30 PST 2015


Cc: Emil Velikov <emil.l.velikov at gmail.com>
---
 .../intrastage-ssbo-different-offset-across-shaders.shader_test       | 4 +++-
 .../intrastage-ubo-different-offset-across-shaders.shader_test        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ssbo-different-offset-across-shaders.shader_test b/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ssbo-different-offset-across-shaders.shader_test
index dee2da0..823df35 100644
--- a/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ssbo-different-offset-across-shaders.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ssbo-different-offset-across-shaders.shader_test
@@ -23,6 +23,8 @@ void f()
 #extension GL_ARB_enhanced_layouts : enable
 #extension GL_ARB_shader_storage_buffer_object : enable
 
+in vec4 piglit_vertex;
+
 layout(std430) buffer b {
        layout(offset = 0) vec4 var1;
        layout(offset = 64) vec4 var2; // Wrong: members and their respective offset across identically named blocks must be the same
@@ -34,7 +36,7 @@ void main()
 {
   f();
 
-  gl_Position = gl_Vertex;
+  gl_Position = piglit_vertex;
 }
 
 [test]
diff --git a/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ubo-different-offset-across-shaders.shader_test b/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ubo-different-offset-across-shaders.shader_test
index ac22303..ed262c5 100644
--- a/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ubo-different-offset-across-shaders.shader_test
+++ b/tests/spec/arb_enhanced_layouts/linker/explicit-offsets/intrastage-ubo-different-offset-across-shaders.shader_test
@@ -22,6 +22,8 @@ void f()
 #version 140
 #extension GL_ARB_enhanced_layouts : enable
 
+in vec4 piglit_vertex;
+
 layout(std140) uniform b {
        layout(offset = 0) vec4 var1;
        layout(offset = 64) vec4 var2; // Wrong: members and their respective offset across identically named blocks must be the same
@@ -33,7 +35,7 @@ void main()
 {
   f();
 
-  gl_Position = gl_Vertex;
+  gl_Position = piglit_vertex;
 }
 
 [test]
-- 
2.4.3



More information about the Piglit mailing list