Re: [Mesa-dev] [PATCH] nir/lower_clip_cull: Fix an incorrect assert

2019-02-21 Thread Kenneth Graunke 
On Thursday, February 21, 2019 8:55:31 AM PST Jason Ekstrand wrote:
> Copy+paste error.  It was supposed to test cull and not clip.
> 
> Fixes: 4e69fba534e "nir: Rewrite lower_clip_cull_distance_arrays..."
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109717
> Cc: Kenneth Graunke 
> ---
>  src/compiler/nir/nir_lower_clip_cull_distance_arrays.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c 
> b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
> index d98ffa69596..70578d6f3fd 100644
> --- a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
> +++ b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
> @@ -101,7 +101,7 @@ combine_clip_cull(nir_shader *nir,
> }
>  
> if (cull) {
> -  assert(clip->data.compact);
> +  assert(cull->data.compact);
>cull->data.how_declared = nir_var_hidden;
>cull->data.location = VARYING_SLOT_CLIP_DIST0 + clip_array_size / 4;
>cull->data.location_frac = clip_array_size % 4;
> 

Whoops.

Reviewed-by: Kenneth Graunke 


signature.asc
Description: This is a digitally signed message part.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] nir/lower_clip_cull: Fix an incorrect assert

2019-02-21 Thread Lionel Landwerlin 

On 21/02/2019 16:55, Jason Ekstrand wrote:

Copy+paste error.  It was supposed to test cull and not clip.

Fixes: 4e69fba534e "nir: Rewrite lower_clip_cull_distance_arrays..."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109717
Cc: Kenneth Graunke 



Trivial, I really thought it was harder than that :)

Thanks!


Reviewed-by: Lionel Landwerlin 



---
  src/compiler/nir/nir_lower_clip_cull_distance_arrays.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c 
b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
index d98ffa69596..70578d6f3fd 100644
--- a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
+++ b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
@@ -101,7 +101,7 @@ combine_clip_cull(nir_shader *nir,
 }
  
 if (cull) {

-  assert(clip->data.compact);
+  assert(cull->data.compact);
cull->data.how_declared = nir_var_hidden;
cull->data.location = VARYING_SLOT_CLIP_DIST0 + clip_array_size / 4;
cull->data.location_frac = clip_array_size % 4;



___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH] nir/lower_clip_cull: Fix an incorrect assert

2019-02-21 Thread Jason Ekstrand 
Copy+paste error.  It was supposed to test cull and not clip.

Fixes: 4e69fba534e "nir: Rewrite lower_clip_cull_distance_arrays..."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109717
Cc: Kenneth Graunke 
---
 src/compiler/nir/nir_lower_clip_cull_distance_arrays.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c 
b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
index d98ffa69596..70578d6f3fd 100644
--- a/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
+++ b/src/compiler/nir/nir_lower_clip_cull_distance_arrays.c
@@ -101,7 +101,7 @@ combine_clip_cull(nir_shader *nir,
}
 
if (cull) {
-  assert(clip->data.compact);
+  assert(cull->data.compact);
   cull->data.how_declared = nir_var_hidden;
   cull->data.location = VARYING_SLOT_CLIP_DIST0 + clip_array_size / 4;
   cull->data.location_frac = clip_array_size % 4;
-- 
2.20.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev