Mesa (master): glsl: update a texture/sampler comment

Brian Paul brianp at kemper.freedesktop.org
Tue Aug 25 23:54:15 UTC 2009


Module: Mesa
Branch: master
Commit: d8b4f8c84884acdda40e01cfd9fd3c10aaab836e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d8b4f8c84884acdda40e01cfd9fd3c10aaab836e

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Aug 25 17:43:16 2009 -0600

glsl: update a texture/sampler comment

---

 src/mesa/shader/slang/slang_link.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 1caf594..169c07f 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -288,6 +288,7 @@ link_uniform_vars(GLcontext *ctx,
    for (i = 0; i < prog->NumInstructions; i++) {
       struct prog_instruction *inst = prog->Instructions + i;
       if (_mesa_is_tex_instruction(inst->Opcode)) {
+         /* here, inst->TexSrcUnit is really the sampler unit */
          const GLint oldSampNum = inst->TexSrcUnit;
 
 #if 0
@@ -295,7 +296,6 @@ link_uniform_vars(GLcontext *ctx,
                 inst->TexSrcUnit, samplerMap[ inst->TexSrcUnit ]);
 #endif
 
-         /* here, texUnit is really samplerUnit */
          if (oldSampNum < Elements(samplerMap)) {
             const GLuint newSampNum = samplerMap[oldSampNum];
             inst->TexSrcUnit = newSampNum;




More information about the mesa-commit mailing list