Commit 208bfc49 authored by Jose Fonseca's avatar Jose Fonseca

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's avatarBrian Paul <brianp@vmware.com>
parent e378184d
......@@ -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;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment