diff options
| author | Topi Pohjolainen <[email protected]> | 2014-02-18 22:50:13 +0200 |
|---|---|---|
| committer | Topi Pohjolainen <[email protected]> | 2014-03-05 10:31:44 +0200 |
| commit | a290cd039cc07330598a101e74d25289ce70bcee (patch) | |
| tree | 4a5443c6f39cda161bb84970bc242793d507e5cd /src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | |
| parent | 81494ec6137d133f999a98474d1660b8c87d2276 (diff) | |
i965: Merge resolving of shader program source
Reviewed-by: Matt Turner <[email protected]>
Signed-off-by: Topi Pohjolainen <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs_visitor.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 424763bd6cb..90272eb68f5 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -2942,17 +2942,13 @@ fs_visitor::fs_visitor(struct brw_context *brw, struct gl_shader_program *shader_prog, struct gl_fragment_program *fp, unsigned dispatch_width) - : backend_visitor(brw, shader_prog, &fp->Base, &c->prog_data.base), + : backend_visitor(brw, shader_prog, &fp->Base, &c->prog_data.base, + MESA_SHADER_FRAGMENT), dispatch_width(dispatch_width) { this->c = c; this->fp = fp; this->mem_ctx = ralloc_context(NULL); - if (shader_prog) - shader = (struct brw_shader *) - shader_prog->_LinkedShaders[MESA_SHADER_FRAGMENT]; - else - shader = NULL; this->failed = false; this->variable_ht = hash_table_ctor(0, hash_table_pointer_hash, |