Mesa (master): i965: Fix FS unit tests

[Ian Romanick]

Module: Mesa
Branch: master
Commit: d43aed9646972c4aca44f47d1b445bd8e67024d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d43aed9646972c4aca44f47d1b445bd8e67024d7

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri May 15 11:55:46 2015 -0700

i965: Fix FS unit tests

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>
Reviewed-by: 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 206a76e..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) {}
 };