OSDN Git Service

mesa/st: fix strict aliasing issue in int64 code.
authorDave Airlie <airlied@redhat.com>
Wed, 8 Feb 2017 01:23:00 +0000 (01:23 +0000)
committerDave Airlie <airlied@redhat.com>
Wed, 8 Feb 2017 02:13:07 +0000 (02:13 +0000)
This fixes the int64 code same as the double code.

Reviewed-by: Timothy Arceri <t_arceri@yahoo.com.au>
Signed-off-by: Dave Airlie <airlied@redhat.com>
src/mesa/state_tracker/st_glsl_to_tgsi.cpp

index 77a51d5..116f30c 100644 (file)
@@ -3363,15 +3363,13 @@ glsl_to_tgsi_visitor::visit(ir_constant *ir)
    case GLSL_TYPE_INT64:
       gl_type = GL_INT64_ARB;
       for (i = 0; i < ir->type->vector_elements; i++) {
-         values[i * 2].i = *(uint32_t *)&ir->value.d[i];
-         values[i * 2 + 1].i = *(((uint32_t *)&ir->value.d[i]) + 1);
+         memcpy(&values[i * 2], &ir->value.d[i], sizeof(int64_t));
       }
       break;
    case GLSL_TYPE_UINT64:
       gl_type = GL_UNSIGNED_INT64_ARB;
       for (i = 0; i < ir->type->vector_elements; i++) {
-         values[i * 2].i = *(uint32_t *)&ir->value.d[i];
-         values[i * 2 + 1].i = *(((uint32_t *)&ir->value.d[i]) + 1);
+         memcpy(&values[i * 2], &ir->value.d[i], sizeof(uint64_t));
       }
       break;
    case GLSL_TYPE_UINT: