Re: [Piglit] [PATCH 2/2] ssbo/linker: move some linker tests to using a fragment shader ssbo

2017-11-17 Thread Timothy Arceri 

Series:

Reviewed-by: Timothy Arceri 

On 17/11/17 13:02, Dave Airlie wrote:

From: Dave Airlie 

---
  .../linker/implicit_size_array_member.shader_test  | 7 +++
  .../linker/sized_arrays_of_arrays_member.shader_test   | 6 ++
  .../linker/unsized_arrays_of_arrays_member.shader_test | 7 +++
  3 files changed, 8 insertions(+), 12 deletions(-)

diff --git 
a/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
 
b/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
index 03b2b7c..7f103ee 100644
--- 
a/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
+++ 
b/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
@@ -12,7 +12,9 @@
  GLSL >= 1.50
  GL_ARB_shader_storage_buffer_object
  
-[vertex shader]

+[vertex shader passthrough]
+
+[fragment shader]
  #version 150
  #extension GL_ARB_shader_storage_buffer_object: require
  
@@ -21,13 +23,10 @@ buffer a {

vec4 a[];
  } b;
  
-in vec4 piglit_vertex;

  out vec4 c;
  
  void main(void) {

c = b.s[0] + b.s[1];
-
-   gl_Position = piglit_vertex;
  }
  
  [test]

diff --git 
a/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
 
b/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
index ae5e682..45c922b 100644
--- 
a/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
+++ 
b/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
@@ -13,7 +13,8 @@ GLSL >= 1.50
  GL_ARB_shader_storage_buffer_object
  GL_ARB_arrays_of_arrays
  
-[vertex shader]

+[vertex shader passthrough]
+[fragment shader]
  #version 150
  #extension GL_ARB_shader_storage_buffer_object: require
  #extension GL_ARB_arrays_of_arrays: require
@@ -23,13 +24,10 @@ buffer a {
vec4 aoa[2][2];
  } b;
  
-in vec4 piglit_vertex;

  out vec4 c;
  
  void main(void) {

c = b.s;
-
-   gl_Position = piglit_vertex;
  }
  
  [test]

diff --git 
a/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
 
b/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
index 614d30e..24eced2 100644
--- 
a/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
+++ 
b/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
@@ -13,7 +13,9 @@ GLSL >= 1.50
  GL_ARB_shader_storage_buffer_object
  GL_ARB_arrays_of_arrays
  
-[vertex shader]

+[vertex shader passthrough]
+
+[fragment shader]
  #version 150
  #extension GL_ARB_shader_storage_buffer_object: require
  #extension GL_ARB_arrays_of_arrays: require
@@ -23,13 +25,10 @@ buffer a {
vec4 aoa[][2];
  } b;
  
-in vec4 piglit_vertex;

  out vec4 c;
  
  void main(void) {

c = b.s;
-
-   gl_Position = piglit_vertex;
  }
  
  [test]



___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH 2/2] ssbo/linker: move some linker tests to using a fragment shader ssbo

2017-11-16 Thread Dave Airlie 
From: Dave Airlie 

---
 .../linker/implicit_size_array_member.shader_test  | 7 +++
 .../linker/sized_arrays_of_arrays_member.shader_test   | 6 ++
 .../linker/unsized_arrays_of_arrays_member.shader_test | 7 +++
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git 
a/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
 
b/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
index 03b2b7c..7f103ee 100644
--- 
a/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
+++ 
b/tests/spec/arb_shader_storage_buffer_object/linker/implicit_size_array_member.shader_test
@@ -12,7 +12,9 @@
 GLSL >= 1.50
 GL_ARB_shader_storage_buffer_object
 
-[vertex shader]
+[vertex shader passthrough]
+
+[fragment shader]
 #version 150
 #extension GL_ARB_shader_storage_buffer_object: require
 
@@ -21,13 +23,10 @@ buffer a {
vec4 a[];
 } b;
 
-in vec4 piglit_vertex;
 out vec4 c;
 
 void main(void) {
c = b.s[0] + b.s[1];
-
-   gl_Position = piglit_vertex;
 }
 
 [test]
diff --git 
a/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
 
b/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
index ae5e682..45c922b 100644
--- 
a/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
+++ 
b/tests/spec/arb_shader_storage_buffer_object/linker/sized_arrays_of_arrays_member.shader_test
@@ -13,7 +13,8 @@ GLSL >= 1.50
 GL_ARB_shader_storage_buffer_object
 GL_ARB_arrays_of_arrays
 
-[vertex shader]
+[vertex shader passthrough]
+[fragment shader]
 #version 150
 #extension GL_ARB_shader_storage_buffer_object: require
 #extension GL_ARB_arrays_of_arrays: require
@@ -23,13 +24,10 @@ buffer a {
vec4 aoa[2][2];
 } b;
 
-in vec4 piglit_vertex;
 out vec4 c;
 
 void main(void) {
c = b.s;
-
-   gl_Position = piglit_vertex;
 }
 
 [test]
diff --git 
a/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
 
b/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
index 614d30e..24eced2 100644
--- 
a/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
+++ 
b/tests/spec/arb_shader_storage_buffer_object/linker/unsized_arrays_of_arrays_member.shader_test
@@ -13,7 +13,9 @@ GLSL >= 1.50
 GL_ARB_shader_storage_buffer_object
 GL_ARB_arrays_of_arrays
 
-[vertex shader]
+[vertex shader passthrough]
+
+[fragment shader]
 #version 150
 #extension GL_ARB_shader_storage_buffer_object: require
 #extension GL_ARB_arrays_of_arrays: require
@@ -23,13 +25,10 @@ buffer a {
vec4 aoa[][2];
 } b;
 
-in vec4 piglit_vertex;
 out vec4 c;
 
 void main(void) {
c = b.s;
-
-   gl_Position = piglit_vertex;
 }
 
 [test]
-- 
2.9.5

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit