diff options
author | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
commit | 31ee9c57db79281e122d3c4acb0f8eae07f4449f (patch) | |
tree | 222bc6f83ebdb15721e7acfdb829aa85606e243a /mesalib/src/mesa/main | |
parent | 8797d6ab8ef5121c900cd74b8662305ec7aeb34b (diff) | |
parent | d03a5f20114203fd00e0004659fd2617f4c03a32 (diff) | |
download | vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.gz vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.bz2 vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/state_tracker/st_context.c
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/wgl_ext_api.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/man/XWin.man
xorg-server/hw/xwin/winmultiwindowwindow.c
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); } |