Mesa (glsl2): linker: Use bit-0 instead of VERT_BIT_GENERIC0

Ian Romanick idr at kemper.freedesktop.org
Wed Jul 7 23:34:10 UTC 2010


Module: Mesa
Branch: glsl2
Commit: 35c89204e597e6d4d3e8b8c665ce1c51d6dde4d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=35c89204e597e6d4d3e8b8c665ce1c51d6dde4d7

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Jul  7 16:28:39 2010 -0700

linker: Use bit-0 instead of VERT_BIT_GENERIC0

Uses of the bits for allocation are offset by 16, and
VERT_BIT_GENERIC0 already has the 16 offset.  As a result, it was
preventing the wrong thing from being allocated.

---

 src/glsl/linker.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 5227d42..eb10f90 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -667,7 +667,7 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
     * be explicitly assigned by via glBindAttribLocation.  Mark it as reserved
     * to prevent it from being automatically allocated below.
     */
-   used_locations |= VERT_BIT_GENERIC0;
+   used_locations |= (1 << 0);
 
    for (unsigned i = 0; i < num_attr; i++) {
       /* Mask representing the contiguous slots that will be used by this




More information about the mesa-commit mailing list