fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix shader prog_execute strict aliasing violations

Browse source 
use unions instead of pointer casts.
This commit is contained in:
Roland Scheidegger 2009-12-07 21:47:49 +01:00
parent 3456f9149b
commit 72362a5cd4
1 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/mesa/shader/prog_execute.c
View file

@ -54,8 +54,18 @@
* Set x to positive or negative infinity.
*/
#if defined(USE_IEEE) || defined(_WIN32)
#define SET_POS_INFINITY(x) ( *((GLuint *) (void *)&x) = 0x7F800000 )
#define SET_NEG_INFINITY(x) ( *((GLuint *) (void *)&x) = 0xFF800000 )
#define SET_POS_INFINITY(x) \
do { \
fi_type fi; \
fi.i = 0x7F800000; \
x = fi.f; \
} while (0)
#define SET_NEG_INFINITY(x) \
do { \
fi_type fi; \
fi.i = 0xFF800000; \
x = fi.f; \
} while (0)
#elif defined(VMS)
#define SET_POS_INFINITY(x) x = __MAXFLOAT
#define SET_NEG_INFINITY(x) x = -__MAXFLOAT
@ -1635,11 +1645,12 @@ _mesa_execute_program(GLcontext * ctx,
case OPCODE_UP2H: /* unpack two 16-bit floats */
{
GLfloat a[4], result[4];
const GLuint *rawBits = (const GLuint *) a;
fi_type fi;
GLhalfNV hx, hy;
fetch_vector1(&inst->SrcReg[0], machine, a);
hx = rawBits[0] & 0xffff;
hy = rawBits[0] >> 16;
fi.f = a[0];
hx = fi.i & 0xffff;
hy = fi.i >> 16;
result[0] = result[2] = _mesa_half_to_float(hx);
result[1] = result[3] = _mesa_half_to_float(hy);
store_vector4(inst, machine, result);
@ -1648,11 +1659,12 @@ _mesa_execute_program(GLcontext * ctx,
case OPCODE_UP2US: /* unpack two GLushorts */
{
GLfloat a[4], result[4];
const GLuint *rawBits = (const GLuint *) a;
fi_type fi;
GLushort usx, usy;
fetch_vector1(&inst->SrcReg[0], machine, a);
usx = rawBits[0] & 0xffff;
usy = rawBits[0] >> 16;
fi.f = a[0];
usx = fi.i & 0xffff;
usy = fi.i >> 16;
result[0] = result[2] = usx * (1.0f / 65535.0f);
result[1] = result[3] = usy * (1.0f / 65535.0f);
store_vector4(inst, machine, result);
@ -1661,24 +1673,26 @@ _mesa_execute_program(GLcontext * ctx,
case OPCODE_UP4B: /* unpack four GLbytes */
{
GLfloat a[4], result[4];
const GLuint *rawBits = (const GLuint *) a;
fi_type fi;
fetch_vector1(&inst->SrcReg[0], machine, a);
result[0] = (((rawBits[0] >> 0) & 0xff) - 128) / 127.0F;
result[1] = (((rawBits[0] >> 8) & 0xff) - 128) / 127.0F;
result[2] = (((rawBits[0] >> 16) & 0xff) - 128) / 127.0F;
result[3] = (((rawBits[0] >> 24) & 0xff) - 128) / 127.0F;
fi.f = a[0];
result[0] = (((fi.i >> 0) & 0xff) - 128) / 127.0F;
result[1] = (((fi.i >> 8) & 0xff) - 128) / 127.0F;
result[2] = (((fi.i >> 16) & 0xff) - 128) / 127.0F;
result[3] = (((fi.i >> 24) & 0xff) - 128) / 127.0F;
store_vector4(inst, machine, result);
}
break;
case OPCODE_UP4UB: /* unpack four GLubytes */
{
GLfloat a[4], result[4];
const GLuint *rawBits = (const GLuint *) a;
fi_type fi;
fetch_vector1(&inst->SrcReg[0], machine, a);
result[0] = ((rawBits[0] >> 0) & 0xff) / 255.0F;
result[1] = ((rawBits[0] >> 8) & 0xff) / 255.0F;
result[2] = ((rawBits[0] >> 16) & 0xff) / 255.0F;
result[3] = ((rawBits[0] >> 24) & 0xff) / 255.0F;
fi.f = a[0];
result[0] = ((fi.i >> 0) & 0xff) / 255.0F;
result[1] = ((fi.i >> 8) & 0xff) / 255.0F;
result[2] = ((fi.i >> 16) & 0xff) / 255.0F;
result[3] = ((fi.i >> 24) & 0xff) / 255.0F;
store_vector4(inst, machine, result);
}
break;