Browse Source

fix broken assertions so dri drivers compile with -DDEBUG (replace GL_STENCIL_INDEX8 with GL_STENCIL_INDEX8_EXT). Fix potential problem with drivers which use 32bit z buffers.

tags/mesa_20060325
Roland Scheidegger 19 years ago
parent
commit
663138a951

+ 7
- 1
src/mesa/drivers/dri/common/drirenderbuffer.c View File

@@ -92,9 +92,15 @@ driNewRenderbuffer(GLenum format, GLvoid *addr,
/* we always Get/Put 32-bit Z values */
drb->Base.DataType = GL_UNSIGNED_INT;
}
else if (format == GL_DEPTH_COMPONENT32) {
/* Depth */
drb->Base._BaseFormat = GL_DEPTH_COMPONENT;
/* we always Get/Put 32-bit Z values */
drb->Base.DataType = GL_UNSIGNED_INT;
}
else {
/* Stencil */
ASSERT(format == GL_STENCIL_INDEX8);
ASSERT(format == GL_STENCIL_INDEX8_EXT);
drb->Base._BaseFormat = GL_STENCIL_INDEX;
drb->Base.DataType = GL_UNSIGNED_BYTE;
}

+ 1
- 1
src/mesa/drivers/dri/sis/sis_dd.c View File

@@ -160,7 +160,7 @@ sisInitRenderbuffer(struct gl_renderbuffer *rb, GLenum format)
}
else {
/* Stencil */
ASSERT(format == GL_STENCIL_INDEX8);
ASSERT(format == GL_STENCIL_INDEX8_EXT);
rb->_BaseFormat = GL_STENCIL_INDEX;
rb->DataType = GL_UNSIGNED_BYTE;
}

+ 1
- 1
src/mesa/drivers/dri/unichrome/via_context.c View File

@@ -177,7 +177,7 @@ viaInitRenderbuffer(struct gl_renderbuffer *rb, GLenum format)
}
else {
/* Stencil */
ASSERT(format == GL_STENCIL_INDEX8);
ASSERT(format == GL_STENCIL_INDEX8_EXT);
rb->_BaseFormat = GL_STENCIL_INDEX;
rb->DataType = GL_UNSIGNED_BYTE;
}

Loading…
Cancel
Save