diff options
author | Eric Anholt <eric@anholt.net> | 2011-03-12 15:00:14 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2011-03-12 15:11:00 -0800 |
commit | 403be1111190a3fe63ae03bc0111e0a0b026495b (patch) | |
tree | d8805ad8110269aec83c7fbe1845842eaebf7aac /src/mesa/drivers/dri/i965/brw_fs.cpp | |
parent | 7735f8c6e525da0ea830f5a54a329abe2d6a1006 (diff) |
Revert "i965: Use the fixed function GLSL program instead of the ARB program."
This reverts commit 81b34a4e3a7aec9cdf2781757408dc5e9eec79cb. There
were regressions in the core change that this depends on.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs.cpp')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index ba4b508589..ce7959b19d 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -1381,7 +1381,7 @@ fs_visitor::visit(ir_texture *ir) assert(!ir->projector); sampler = _mesa_get_sampler_uniform_value(ir->sampler, - ctx->Shader._CurrentFragmentProgram, + ctx->Shader.CurrentFragmentProgram, &brw->fragment_program->Base); sampler = c->fp->program.Base.SamplerUnits[sampler]; @@ -3454,7 +3454,7 @@ fs_visitor::generate_code() if (unlikely(INTEL_DEBUG & DEBUG_WM)) { printf("Native code for fragment shader %d:\n", - ctx->Shader._CurrentFragmentProgram->Name); + ctx->Shader.CurrentFragmentProgram->Name); } foreach_iter(exec_list_iterator, iter, this->instructions) { @@ -3723,7 +3723,7 @@ brw_wm_fs_emit(struct brw_context *brw, struct brw_wm_compile *c) { struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; - struct gl_shader_program *prog = ctx->Shader._CurrentFragmentProgram; + struct gl_shader_program *prog = ctx->Shader.CurrentFragmentProgram; if (!prog) return GL_FALSE; |