diff options
| author | Brian Paul <[email protected]> | 2014-03-22 11:23:32 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2014-03-26 10:31:13 -0600 |
| commit | 1f4ebfaa889ba3c9ff2154459544984e45ae4714 (patch) | |
| tree | 3173158ea64241745ec507f1c52564dbc9f2b6a0 /src/mesa | |
| parent | c1377ed464323a02497e2faf9a5479180e1fa3bc (diff) | |
mesa: fix unpack_Z32_FLOAT_X24S8() / unpack_Z32_FLOAT() mix-up
And use the z32f_x24s8 helper struct in unpack_Z32_FLOAT_X24S8().
Cc: "10.0" "10.1" <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/format_unpack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/format_unpack.c b/src/mesa/main/format_unpack.c index ea1ac38afa3..2ef2e31d666 100644 --- a/src/mesa/main/format_unpack.c +++ b/src/mesa/main/format_unpack.c @@ -717,20 +717,20 @@ unpack_Z32(const void *src, GLfloat dst[][4], GLuint n) } static void -unpack_Z32_FLOAT(const void *src, GLfloat dst[][4], GLuint n) +unpack_Z32_FLOAT_X24S8(const void *src, GLfloat dst[][4], GLuint n) { - const GLfloat *s = ((const GLfloat *) src); + const struct z32f_x24s8 *s = (const struct z32f_x24s8 *) src; GLuint i; for (i = 0; i < n; i++) { dst[i][0] = dst[i][1] = - dst[i][2] = s[i * 2]; + dst[i][2] = s[i].z; dst[i][3] = 1.0F; } } static void -unpack_Z32_FLOAT_X24S8(const void *src, GLfloat dst[][4], GLuint n) +unpack_Z32_FLOAT(const void *src, GLfloat dst[][4], GLuint n) { const GLfloat *s = ((const GLfloat *) src); GLuint i; |