[Mesa-dev] [PATCH] i965: Fix FS unit tests

[Kenneth Graunke]

On Friday, May 15, 2015 11:57:16 AM Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 
> Commit 3687d75 changed the fs_visitor constructors, but it didn't update
> all the users.  As a result, 'make check' fails.
> 
> I added the explicit cast to the gl_program* parameter to make it more
> clear which NULL was which.
> 
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> Cc: Kenneth Graunke <kenneth at whitecape.org>
> ---
>  src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp     | 3 ++-
>  src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> index 206a76e92..0e48e82 100644
> --- a/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> +++ b/src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
> @@ -45,7 +45,8 @@ public:
>     cmod_propagation_fs_visitor(struct brw_context *brw,
>                                 struct brw_wm_prog_data *prog_data,
>                                 struct gl_shader_program *shader_prog)
> -      : fs_visitor(brw, NULL, NULL, prog_data, shader_prog, NULL, 8) {}
> +      : fs_visitor(brw, NULL, MESA_SHADER_FRAGMENT, NULL, &prog_data->base,
> +                   shader_prog, (struct gl_program *) NULL, 8) {}
>  };
>  
>  
> diff --git a/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp b/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp
> index 4c91af3..8b1fab0 100644
> --- a/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp
> +++ b/src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp
> @@ -45,7 +45,8 @@ public:
>     saturate_propagation_fs_visitor(struct brw_context *brw,
>                                     struct brw_wm_prog_data *prog_data,
>                                     struct gl_shader_program *shader_prog)
> -      : fs_visitor(brw, NULL, NULL, prog_data, shader_prog, NULL, 8) {}
> +      : fs_visitor(brw, NULL, MESA_SHADER_FRAGMENT, NULL, &prog_data->base,
> +                   shader_prog, (struct gl_program *) NULL, 8) {}
>  };
>  
>  
> 

Sorry!

Reviewed-by: Kenneth Graunke <kenneth at Whitecape.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150515/adcbd280/attachment.sig>