fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965/fs: Fix up for 8752764076.

Browse source 
I failed to commit and squash before pushing.
This commit is contained in:
Eric Anholt 2011-05-27 09:50:34 -07:00
parent 9bd7e9c6b2
commit 0653c450cc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_fs_emit.cpp
View file

@ -602,7 +602,7 @@ fs_visitor::generate_code()
if (unlikely(INTEL_DEBUG & DEBUG_WM)) {
printf("Native code for fragment shader %d (%d-wide dispatch):\n",
ctx->Shader.CurrentFragmentProgram->Name, c->dispatch_width);
prog->Name, c->dispatch_width);
}
foreach_iter(exec_list_iterator, iter, this->instructions) {

6
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
View file

@ -867,9 +867,9 @@ fs_visitor::visit(ir_texture *ir)
assert(!ir->projector);
sampler = _mesa_get_sampler_uniform_value(ir->sampler,
ctx->Shader.CurrentFragmentProgram,
&brw->fragment_program->Base);
sampler = c->fp->program.Base.SamplerUnits[sampler];
prog,
&fp->Base);
sampler = fp->Base.SamplerUnits[sampler];
/* The 965 requires the EU to do the normalization of GL rectangle
* texture coordinates. We use the program parameter state