diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-14 09:02:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-14 09:02:09 +0200 |
| commit | d03a5f20114203fd00e0004659fd2617f4c03a32 (patch) | |
| tree | 769d9c09953195385ac9c19aa31a1303b462d2d6 /mesalib/src/mesa/main | |
| parent | 3b47b2c35227184c0eb6dcf6dee8b79c4f9d4474 (diff) | |
| download | vcxsrv-d03a5f20114203fd00e0004659fd2617f4c03a32.tar.gz vcxsrv-d03a5f20114203fd00e0004659fd2617f4c03a32.tar.bz2 vcxsrv-d03a5f20114203fd00e0004659fd2617f4c03a32.zip | |
mesa xserver git update 14 july 2011
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/texfetch_tmp.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/texfetch_tmp.h b/mesalib/src/mesa/main/texfetch_tmp.h index 3b1eedf39..d170adf2e 100644 --- a/mesalib/src/mesa/main/texfetch_tmp.h +++ b/mesalib/src/mesa/main/texfetch_tmp.h @@ -2287,7 +2287,8 @@ static void FETCH(f_z24_s8)( const struct gl_texture_image *texImage, const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); const GLfloat scale = 1.0F / (GLfloat) 0xffffff; texel[0] = ((*src) >> 8) * scale; - ASSERT(texImage->TexFormat == MESA_FORMAT_Z24_S8); + ASSERT(texImage->TexFormat == MESA_FORMAT_Z24_S8 || + texImage->TexFormat == MESA_FORMAT_Z24_X8); ASSERT(texel[0] >= 0.0F); ASSERT(texel[0] <= 1.0F); } @@ -2314,7 +2315,8 @@ static void FETCH(f_s8_z24)( const struct gl_texture_image *texImage, const GLuint *src = TEXEL_ADDR(GLuint, texImage, i, j, k, 1); const GLfloat scale = 1.0F / (GLfloat) 0xffffff; texel[0] = ((*src) & 0x00ffffff) * scale; - ASSERT(texImage->TexFormat == MESA_FORMAT_S8_Z24); + ASSERT(texImage->TexFormat == MESA_FORMAT_S8_Z24 || + texImage->TexFormat == MESA_FORMAT_X8_Z24); ASSERT(texel[0] >= 0.0F); ASSERT(texel[0] <= 1.0F); } |