Re: [Piglit] [PATCH V2] arb_shader_image_load_store: fix syntax error in execution tests

2016-01-20 Thread Timothy Arceri 
On Wed, 2016-01-20 at 03:42 -0500, Ilia Mirkin wrote:
> On Tue, Jan 19, 2016 at 9:21 PM, Timothy Arceri
>  wrote:
> > @@ -98,7 +98,7 @@ header_hunk(const struct grid_info grid)
> >   "#define H %d\n"
> >   "#define N %d\n"
> >   "#define GRID_T %s\n"
> > - "#define RET_IMAGE_T layout(%s) %s2D\n",
> > + "#define RET_IMAGE_UNIFORM_T uniform layout(%s)
> > %s2D\n",
> >   grid.size.x, grid.size.y, product(grid.size),
> >   image_vector_type_name(grid.format),
> >   grid.format->name, image_type_name(grid.format));
> 
> Doesn't this do the exact opposite of what you wanted? I thought you
> wanted
> 
> layout(foo) uniform bla;
> 
> While this change leaves uniform before the layout.

Correct. I missed this in testing as for some reason this only gets run
on IVB and HSW. Fix sent.



> 
>   -ilia
> ___
> Piglit mailing list
> Piglit@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH V2] arb_shader_image_load_store: fix syntax error in execution tests

2016-01-20 Thread Ilia Mirkin 
On Tue, Jan 19, 2016 at 9:21 PM, Timothy Arceri
 wrote:
> @@ -98,7 +98,7 @@ header_hunk(const struct grid_info grid)
>   "#define H %d\n"
>   "#define N %d\n"
>   "#define GRID_T %s\n"
> - "#define RET_IMAGE_T layout(%s) %s2D\n",
> + "#define RET_IMAGE_UNIFORM_T uniform layout(%s) %s2D\n",
>   grid.size.x, grid.size.y, product(grid.size),
>   image_vector_type_name(grid.format),
>   grid.format->name, image_type_name(grid.format));

Doesn't this do the exact opposite of what you wanted? I thought you wanted

layout(foo) uniform bla;

While this change leaves uniform before the layout.

  -ilia
___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH V2] arb_shader_image_load_store: fix syntax error in execution tests

2016-01-19 Thread Timothy Arceri 
In GLSL 1.50 layout qualifiers must come before the storage
qualifier. A recent fix in Mesa exposed this issue.

V2: rename IMAGE_T -> IMAGE_UNIFORM_T, fix DST/SRC_IMAGE_T miss in V1

Cc: Francisco Jerez 
---
 tests/spec/arb_shader_image_load_store/atomicity.c  | 2 +-
 tests/spec/arb_shader_image_load_store/bitcast.c| 2 +-
 tests/spec/arb_shader_image_load_store/coherency.c  | 4 ++--
 tests/spec/arb_shader_image_load_store/common.c | 8 
 tests/spec/arb_shader_image_load_store/dead-fragments.c | 2 +-
 tests/spec/arb_shader_image_load_store/early-z.c| 2 +-
 tests/spec/arb_shader_image_load_store/grid.c   | 6 +++---
 tests/spec/arb_shader_image_load_store/host-mem-barrier.c   | 4 ++--
 tests/spec/arb_shader_image_load_store/indexing.c   | 2 +-
 tests/spec/arb_shader_image_load_store/invalid.c| 2 +-
 tests/spec/arb_shader_image_load_store/layer.c  | 2 +-
 tests/spec/arb_shader_image_load_store/level.c  | 2 +-
 tests/spec/arb_shader_image_load_store/max-images.c | 2 +-
 tests/spec/arb_shader_image_load_store/max-size.c   | 4 ++--
 tests/spec/arb_shader_image_load_store/restrict.c   | 4 ++--
 tests/spec/arb_shader_image_load_store/semantics.c  | 4 ++--
 tests/spec/arb_shader_image_load_store/shader-mem-barrier.c | 2 +-
 tests/spec/arb_shader_image_load_store/state.c  | 2 +-
 tests/spec/arb_shader_image_load_store/unused.c | 2 +-
 19 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/spec/arb_shader_image_load_store/atomicity.c 
b/tests/spec/arb_shader_image_load_store/atomicity.c
index 92e3afa..fe6bdb3 100644
--- a/tests/spec/arb_shader_image_load_store/atomicity.c
+++ b/tests/spec/arb_shader_image_load_store/atomicity.c
@@ -128,7 +128,7 @@ run_test(uint32_t init_value, unsigned check_sz, uint32_t 
check_value,
 GLuint prog = generate_program(
 grid, GL_FRAGMENT_SHADER,
 concat(image_hunk(img, ""),
-   hunk("volatile uniform IMAGE_T img;\n"),
+   hunk("volatile IMAGE_UNIFORM_T img;\n"),
hunk(op), NULL));
 bool ret = prog &&
 init_fb(grid) &&
diff --git a/tests/spec/arb_shader_image_load_store/bitcast.c 
b/tests/spec/arb_shader_image_load_store/bitcast.c
index ab04ca1..9180e79 100644
--- a/tests/spec/arb_shader_image_load_store/bitcast.c
+++ b/tests/spec/arb_shader_image_load_store/bitcast.c
@@ -126,7 +126,7 @@ run_test(const struct image_format_info *src_format,
 GLuint prog = generate_program(
 grid, GL_FRAGMENT_SHADER,
 concat(image_hunk(dst_img, ""),
-   hunk("uniform IMAGE_T img;\n"
+   hunk("IMAGE_UNIFORM_T img;\n"
 "\n"
 "GRID_T op(ivec2 idx, GRID_T x) {\n"
 "return imageLoad(img, IMAGE_ADDR(idx));\n"
diff --git a/tests/spec/arb_shader_image_load_store/coherency.c 
b/tests/spec/arb_shader_image_load_store/coherency.c
index 5a5bbdd..365e3ec 100644
--- a/tests/spec/arb_shader_image_load_store/coherency.c
+++ b/tests/spec/arb_shader_image_load_store/coherency.c
@@ -142,7 +142,7 @@ run_test(const struct image_qualifier_info *qual,
 stage_w->stage,
 concat(qualifier_hunk(qual),
image_hunk(img, ""),
-   hunk("IMAGE_Q uniform IMAGE_T img;\n"
+   hunk("IMAGE_Q IMAGE_UNIFORM_T img;\n"
 "\n"
 "GRID_T op(ivec2 idx, GRID_T x) {\n"
 "   imageStore(img, idx, DATA_T(11, 22, 33, 
44));"
@@ -158,7 +158,7 @@ run_test(const struct image_qualifier_info *qual,
 stage_r->stage,
 concat(qualifier_hunk(qual),
image_hunk(img, ""),
-   hunk("IMAGE_Q uniform IMAGE_T img;\n"
+   hunk("IMAGE_Q IMAGE_UNIFORM_T img;\n"
 "\n"
 "GRID_T op(ivec2 idx, GRID_T x) {\n"
 "   DATA_T v = imageLoad(img, idx);"
diff --git a/tests/spec/arb_shader_image_load_store/common.c 
b/tests/spec/arb_shader_image_load_store/common.c
index 3e56c22..f5a387a 100644
--- a/tests/spec/arb_shader_image_load_store/common.c
+++ b/tests/spec/arb_shader_image_load_store/common.c
@@ -286,8 +286,8 @@ upload_image_levels(const struct image_info img, unsigned 
num_levels,
 grid, GL_FRAGMENT_SHADER,
 concat(image_hunk(image_info_for_grid(grid), "SRC_"),
image_hunk(img, "DST_"),
-   hunk("readonly uniform SRC_IMAGE_T src_img;\n"
-"writeonly uniform DST_IMAGE_T

Re: [Piglit] [PATCH V2] arb_shader_image_load_store: fix syntax error in execution tests

2016-01-19 Thread Francisco Jerez 
Timothy Arceri  writes:

> In GLSL 1.50 layout qualifiers must come before the storage
> qualifier. A recent fix in Mesa exposed this issue.
>
> V2: rename IMAGE_T -> IMAGE_UNIFORM_T, fix DST/SRC_IMAGE_T miss in V1
>
> Cc: Francisco Jerez 

Reviewed-by: Francisco Jerez 

> ---
>  tests/spec/arb_shader_image_load_store/atomicity.c  | 2 +-
>  tests/spec/arb_shader_image_load_store/bitcast.c| 2 +-
>  tests/spec/arb_shader_image_load_store/coherency.c  | 4 ++--
>  tests/spec/arb_shader_image_load_store/common.c | 8 
>  tests/spec/arb_shader_image_load_store/dead-fragments.c | 2 +-
>  tests/spec/arb_shader_image_load_store/early-z.c| 2 +-
>  tests/spec/arb_shader_image_load_store/grid.c   | 6 +++---
>  tests/spec/arb_shader_image_load_store/host-mem-barrier.c   | 4 ++--
>  tests/spec/arb_shader_image_load_store/indexing.c   | 2 +-
>  tests/spec/arb_shader_image_load_store/invalid.c| 2 +-
>  tests/spec/arb_shader_image_load_store/layer.c  | 2 +-
>  tests/spec/arb_shader_image_load_store/level.c  | 2 +-
>  tests/spec/arb_shader_image_load_store/max-images.c | 2 +-
>  tests/spec/arb_shader_image_load_store/max-size.c   | 4 ++--
>  tests/spec/arb_shader_image_load_store/restrict.c   | 4 ++--
>  tests/spec/arb_shader_image_load_store/semantics.c  | 4 ++--
>  tests/spec/arb_shader_image_load_store/shader-mem-barrier.c | 2 +-
>  tests/spec/arb_shader_image_load_store/state.c  | 2 +-
>  tests/spec/arb_shader_image_load_store/unused.c | 2 +-
>  19 files changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/tests/spec/arb_shader_image_load_store/atomicity.c 
> b/tests/spec/arb_shader_image_load_store/atomicity.c
> index 92e3afa..fe6bdb3 100644
> --- a/tests/spec/arb_shader_image_load_store/atomicity.c
> +++ b/tests/spec/arb_shader_image_load_store/atomicity.c
> @@ -128,7 +128,7 @@ run_test(uint32_t init_value, unsigned check_sz, uint32_t 
> check_value,
>  GLuint prog = generate_program(
>  grid, GL_FRAGMENT_SHADER,
>  concat(image_hunk(img, ""),
> -   hunk("volatile uniform IMAGE_T img;\n"),
> +   hunk("volatile IMAGE_UNIFORM_T img;\n"),
> hunk(op), NULL));
>  bool ret = prog &&
>  init_fb(grid) &&
> diff --git a/tests/spec/arb_shader_image_load_store/bitcast.c 
> b/tests/spec/arb_shader_image_load_store/bitcast.c
> index ab04ca1..9180e79 100644
> --- a/tests/spec/arb_shader_image_load_store/bitcast.c
> +++ b/tests/spec/arb_shader_image_load_store/bitcast.c
> @@ -126,7 +126,7 @@ run_test(const struct image_format_info *src_format,
>  GLuint prog = generate_program(
>  grid, GL_FRAGMENT_SHADER,
>  concat(image_hunk(dst_img, ""),
> -   hunk("uniform IMAGE_T img;\n"
> +   hunk("IMAGE_UNIFORM_T img;\n"
>  "\n"
>  "GRID_T op(ivec2 idx, GRID_T x) {\n"
>  "return imageLoad(img, 
> IMAGE_ADDR(idx));\n"
> diff --git a/tests/spec/arb_shader_image_load_store/coherency.c 
> b/tests/spec/arb_shader_image_load_store/coherency.c
> index 5a5bbdd..365e3ec 100644
> --- a/tests/spec/arb_shader_image_load_store/coherency.c
> +++ b/tests/spec/arb_shader_image_load_store/coherency.c
> @@ -142,7 +142,7 @@ run_test(const struct image_qualifier_info *qual,
>  stage_w->stage,
>  concat(qualifier_hunk(qual),
> image_hunk(img, ""),
> -   hunk("IMAGE_Q uniform IMAGE_T img;\n"
> +   hunk("IMAGE_Q IMAGE_UNIFORM_T img;\n"
>  "\n"
>  "GRID_T op(ivec2 idx, GRID_T x) {\n"
>  "   imageStore(img, idx, DATA_T(11, 22, 33, 
> 44));"
> @@ -158,7 +158,7 @@ run_test(const struct image_qualifier_info *qual,
>  stage_r->stage,
>  concat(qualifier_hunk(qual),
> image_hunk(img, ""),
> -   hunk("IMAGE_Q uniform IMAGE_T img;\n"
> +   hunk("IMAGE_Q IMAGE_UNIFORM_T img;\n"
>  "\n"
>  "GRID_T op(ivec2 idx, GRID_T x) {\n"
>  "   DATA_T v = imageLoad(img, idx);"
> diff --git a/tests/spec/arb_shader_image_load_store/common.c 
> b/tests/spec/arb_shader_image_load_store/common.c
> index 3e56c22..f5a387a 100644
> --- a/tests/spec/arb_shader_image_load_store/common.c
> +++ b/tests/spec/arb_shader_image_load_store/common.c
> @@ -286,8 +286,8 @@ upload_image_levels(const struct image_info img, unsigned 
> num_levels,
>  grid, GL_FRAGMENT_SHADER,
>