fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Avoid aliasing violation in uniform_query.cpp.

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:58 -07:00
parent f5ac1d366e
commit 2a1d2874f1
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/mesa/main/uniform_query.cpp
View file

@ -382,9 +382,12 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
case GLSL_TYPE_BOOL:
dst[didx].f = src[sidx].i ? 1.0f : 0.0f;
break;
case GLSL_TYPE_DOUBLE:
dst[didx].f = *(double *)&src[sidx].f;
case GLSL_TYPE_DOUBLE: {
double tmp;
memcpy(&tmp, &src[sidx].f, sizeof(tmp));
dst[didx].f = tmp;
break;
}
default:
assert(!"Should not get here.");
break;
@ -392,20 +395,28 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
break;
case GLSL_TYPE_DOUBLE:
switch (uni->type->base_type) {
case GLSL_TYPE_UINT:
*(double *)&dst[didx].f = (double) src[sidx].u;
case GLSL_TYPE_UINT: {
double tmp = src[sidx].u;
memcpy(&dst[didx].f, &tmp, sizeof(tmp));
break;
}
case GLSL_TYPE_INT:
case GLSL_TYPE_SAMPLER:
case GLSL_TYPE_IMAGE:
*(double *)&dst[didx].f = (double) src[sidx].i;
case GLSL_TYPE_IMAGE: {
double tmp = src[sidx].i;
memcpy(&dst[didx].f, &tmp, sizeof(tmp));
break;
case GLSL_TYPE_BOOL:
*(double *)&dst[didx].f = src[sidx].i ? 1.0f : 0.0f;
}
case GLSL_TYPE_BOOL: {
double tmp = src[sidx].i ? 1.0 : 0.0;
memcpy(&dst[didx].f, &tmp, sizeof(tmp));
break;
case GLSL_TYPE_FLOAT:
*(double *)&dst[didx].f = (double) src[sidx].f;
}
case GLSL_TYPE_FLOAT: {
double tmp = src[sidx].f;
memcpy(&dst[didx].f, &tmp, sizeof(tmp));
break;
}
default:
assert(!"Should not get here.");
break;
@ -437,9 +448,12 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
case GLSL_TYPE_BOOL:
dst[didx].i = src[sidx].i ? 1 : 0;
break;
case GLSL_TYPE_DOUBLE:
dst[didx].i = IROUNDD(*(double *)&src[sidx].f);
case GLSL_TYPE_DOUBLE: {
double tmp;
memcpy(&tmp, &src[sidx].f, sizeof(tmp));
dst[didx].i = IROUNDD(tmp);
break;
}
default:
assert(!"Should not get here.");
break;
@ -486,9 +500,12 @@ log_uniform(const void *values, enum glsl_base_type basicType,
case GLSL_TYPE_FLOAT:
printf("%g ", v[i].f);
break;
case GLSL_TYPE_DOUBLE:
printf("%g ", *(double* )&v[i * 2].f);
case GLSL_TYPE_DOUBLE: {
double tmp;
memcpy(&tmp, &v[i * 2].f, sizeof(tmp));
printf("%g ", tmp);
break;
}
default:
assert(!"Should not get here.");
break;