glsl: Ensure 64bits shift is used.

I believe that `1u << x`, where x >= 32 yields undefined results
according to the C standard.

Particularly MSVC says `warning C4334: '<<' : result of 32-bit shift
implicitly converted to 64 bits (was 64-bit shift intended?)`.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 8763cc5b07d776dc62d44f4822d8c9e157726061..3853abdb8e6bc07199845e2c0593ded405ae66e0 100644 (file)
--- a/src/glsl/link_varyings.cpp
+++ b/src/glsl/link_varyings.cpp
@@ -1110,8 +1110,8 @@ varying_matches::assign_locations(struct gl_shader_program *prog,
        */
       for (unsigned j = 0; j < num_elements; j++) {
          while ((slot_end < MAX_VARYING * 4u) &&
-                ((reserved_slots & (1u << *location / 4u) ||
-                 (reserved_slots & (1u << slot_end / 4u))))) {
+                ((reserved_slots & (UINT64_C(1) << *location / 4u) ||
+                 (reserved_slots & (UINT64_C(1) << slot_end / 4u))))) {
 
             *location = ALIGN(*location + 1, 4);
             slot_end = *location;
@@ -1529,7 +1529,7 @@ reserved_varying_slot(struct gl_shader *stage, ir_variable_mode io_mode)
          ->count_attribute_slots(stage->Stage == MESA_SHADER_VERTEX);
       for (unsigned i = 0; i < num_elements; i++) {
          if (var_slot >= 0 && var_slot < MAX_VARYING)
-            slots |= 1u << var_slot;
+            slots |= UINT64_C(1) << var_slot;
          var_slot += 1;
       }
    }