diff options
author | Eric Anholt <eric@anholt.net> | 2011-01-12 12:37:08 -0800 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2011-03-11 12:55:14 -0800 |
commit | 81b34a4e3a7aec9cdf2781757408dc5e9eec79cb (patch) | |
tree | 33fc2ffeace0cdae5d6c130e1a281207b8070fee /src/mesa/drivers/dri/i965/brw_fs.cpp | |
parent | b4452c3baad6e0379eeb7f22f2e51d13999e1323 (diff) |
i965: Use the fixed function GLSL program instead of the ARB program.
This gets one more piece of the pipeline onto the new codegen backend.
Once ARB_fragment_program can generate GLSL programs, we can nuke the
old backend.
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 ce7959b19d..ba4b508589 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; |