We can easily recover it from prog, and this makes it clear that we
aren't passing additional information in.
---
src/mesa/drivers/dri/i965/brw_fs.cpp | 4 ++--
src/mesa/drivers/dri/i965/brw_fs.h | 2 +-
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp
b/src/mesa/drivers/dri/i965/brw_fs.cpp
index bcb6727..a370bcd 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -2177,7 +2177,7 @@ brw_wm_fs_emit(struct brw_context *brw, struct
brw_wm_compile *c,
/* Now the main event: Visit the shader IR and generate our FS IR for it.
*/
- fs_visitor v(c, prog, shader, 8);
+ fs_visitor v(c, prog, 8);
if (!v.run()) {
prog->LinkStatus = false;
ralloc_strcat(&prog->InfoLog, v.fail_msg);
@@ -2189,7 +2189,7 @@ brw_wm_fs_emit(struct brw_context *brw, struct
brw_wm_compile *c,
}
if (intel->gen >= 5 && c->prog_data.nr_pull_params == 0) {
- fs_visitor v2(c, prog, shader, 16);
+ fs_visitor v2(c, prog, 16);
v2.import_uniforms(&v);
if (!v2.run()) {
perf_debug("16-wide shader failed to compile, falling back to "
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h
b/src/mesa/drivers/dri/i965/brw_fs.h
index 7490eb6..27c4440 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -185,7 +185,7 @@ class fs_visitor : public backend_visitor
public:
fs_visitor(struct brw_wm_compile *c, struct gl_shader_program *prog,
- struct brw_shader *shader, unsigned dispatch_width);
+ unsigned dispatch_width);
~fs_visitor();
fs_reg *variable_storage(ir_variable *var);
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 28c7c5a..12f9a72 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -2175,7 +2175,7 @@ fs_visitor::resolve_bool_comparison(ir_rvalue *rvalue,
fs_reg *reg)
}
fs_visitor::fs_visitor(struct brw_wm_compile *c, struct gl_shader_program
*prog,
- struct brw_shader *shader, unsigned dispatch_width)
+ unsigned dispatch_width)
{
this->c = c;
this->p = &c->func;
@@ -2185,7 +2185,8 @@ fs_visitor::fs_visitor(struct brw_wm_compile *c, struct
gl_shader_program *prog,
this->intel = &brw->intel;
this->ctx = &intel->ctx;
this->mem_ctx = ralloc_context(NULL);
- this->shader = shader;
+ this->shader = prog == NULL ? NULL :
+ (struct brw_shader *) prog->_LinkedShaders[MESA_SHADER_FRAGMENT];
this->dispatch_width = dispatch_width;
this->failed = false;
this->variable_ht = hash_table_ctor(0,
--
1.8.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
