AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Avoid aliasing violations.

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Matt Turner
2016-05-26 15:53:00 -07:00
parent d1f6f65697
commit 149309a424
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/glsl/ir_constant_expression.cpp
+3 -8
View File
@@ -1573,18 +1573,13 @@ ir_expression::constant_expression_value(struct hash_table *variable_context)
data.f[c] = CLAMP(op[0]->value.f[c], 0.0f, 1.0f);
}
break;
case ir_unop_pack_double_2x32: {
case ir_unop_pack_double_2x32:
/* XXX needs to be checked on big-endian */
uint64_t temp;
temp = (uint64_t)op[0]->value.u[0] | ((uint64_t)op[0]->value.u[1] << 32);
data.d[0] = *(double *)&temp;
memcpy(&data.d[0], &op[0]->value.u[0], sizeof(double));
break;
}
case ir_unop_unpack_double_2x32:
/* XXX needs to be checked on big-endian */
data.u[0] = *(uint32_t *)&op[0]->value.d[0];
data.u[1] = *((uint32_t *)&op[0]->value.d[0] + 1);
memcpy(&data.u[0], &op[0]->value.d[0], sizeof(double));
break;
case ir_triop_bitfield_extract: {
src/compiler/glsl/link_uniform_initializers.cpp
+1 -2
View File
@@ -65,8 +65,7 @@ copy_constant_to_storage(union gl_constant_value *storage,
break;
case GLSL_TYPE_DOUBLE:
/* XXX need to check on big-endian */
storage[i * 2].u = *(uint32_t *)&val->value.d[i];
storage[i * 2 + 1].u = *(((uint32_t *)&val->value.d[i]) + 1);
memcpy(&storage[i * 2].u, &val->value.d[i], sizeof(double));
break;
case GLSL_TYPE_BOOL:
storage[i].b = val->value.b[i] ? boolean_true : 0;