Mesa (mesa_7_4_branch): mesa: use correct tex unit lod bias for TXB instruction
Brian Paul
brianp at kemper.freedesktop.org
Thu Apr 2 19:12:07 UTC 2009
Module: Mesa
Branch: mesa_7_4_branch
Commit: 0590edeea038659d18332b61c504ccf6e97fe7fc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0590edeea038659d18332b61c504ccf6e97fe7fc
Author: Brian Paul <brianp at vmware.com>
Date: Thu Apr 2 13:09:32 2009 -0600
mesa: use correct tex unit lod bias for TXB instruction
(cherry picked from master, commit 1ab225017ed1ea8bd9e266d10ee56ab914bb28c1)
---
src/mesa/shader/prog_execute.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index a93733c..6a79cf4 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -1577,8 +1577,8 @@ _mesa_execute_program(GLcontext * ctx,
case OPCODE_TXB: /* GL_ARB_fragment_program only */
/* Texel lookup with LOD bias */
{
- const struct gl_texture_unit *texUnit
- = &ctx->Texture.Unit[inst->TexSrcUnit];
+ const GLuint unit = machine->Samplers[inst->TexSrcUnit];
+ const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
GLfloat texcoord[4], color[4], lodBias;
fetch_vector4(&inst->SrcReg[0], machine, texcoord);
More information about the mesa-commit
mailing list