aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-12 08:07:49 +0200
committermarha <marha@users.sourceforge.net>2011-07-12 08:07:49 +0200
commitf9f3118e6636a03c096898e023e7e13a328cbaed (patch)
tree2799648cd825202ce426fc1e55b235a8d9ebbb03 /mesalib/src/mesa/main
parent7a945c825829cbadecebc3723e96a786244b9971 (diff)
parent3b47b2c35227184c0eb6dcf6dee8b79c4f9d4474 (diff)
downloadvcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.tar.gz
vcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.tar.bz2
vcxsrv-f9f3118e6636a03c096898e023e7e13a328cbaed.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'mesalib/src/mesa/main')
-rw-r--r--mesalib/src/mesa/main/depthstencil.c3
-rw-r--r--mesalib/src/mesa/main/formats.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/depthstencil.c b/mesalib/src/mesa/main/depthstencil.c
index c8345ccff..1fdd1cc0e 100644
--- a/mesalib/src/mesa/main/depthstencil.c
+++ b/mesalib/src/mesa/main/depthstencil.c
@@ -63,7 +63,8 @@ static void
delete_wrapper(struct gl_renderbuffer *rb)
{
ASSERT(rb->Format == MESA_FORMAT_S8 ||
- rb->Format == MESA_FORMAT_X8_Z24);
+ rb->Format == MESA_FORMAT_X8_Z24 ||
+ rb->Format == MESA_FORMAT_Z32_FLOAT);
_mesa_reference_renderbuffer(&rb->Wrapped, NULL);
free(rb);
}
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index 251944212..3e82458d2 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -1485,7 +1485,9 @@ _mesa_test_formats(void)
info->DataType == GL_SIGNED_NORMALIZED ||
info->DataType == GL_UNSIGNED_INT ||
info->DataType == GL_INT ||
- info->DataType == GL_FLOAT);
+ info->DataType == GL_FLOAT ||
+ /* Z32_FLOAT_X24S8 has DataType of GL_NONE */
+ info->DataType == GL_NONE);
if (info->BaseFormat == GL_RGB) {
assert(info->RedBits > 0);