diff options
| author | Roland Scheidegger <rscheidegger@gmx.ch> | 2006-01-30 23:49:31 +0000 |
|---|---|---|
| committer | Roland Scheidegger <rscheidegger@gmx.ch> | 2006-01-30 23:49:31 +0000 |
| commit | 663138a9510be5d2f3ee2bda41e3a8c86ab688b5 (patch) | |
| tree | d0293e94808813a7d2e9cf9ad429f012c05d580d | |
| parent | a45f23bed141fc23300b8cd6960ba95e883a57bf (diff) | |
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.
| -rw-r--r-- | src/mesa/drivers/dri/common/drirenderbuffer.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/sis/sis_dd.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_context.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/common/drirenderbuffer.c b/src/mesa/drivers/dri/common/drirenderbuffer.c index cb26bb4897..29ba1ea8a3 100644 --- a/src/mesa/drivers/dri/common/drirenderbuffer.c +++ b/src/mesa/drivers/dri/common/drirenderbuffer.c @@ -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; } diff --git a/src/mesa/drivers/dri/sis/sis_dd.c b/src/mesa/drivers/dri/sis/sis_dd.c index 4e73f562b0..39c00a18af 100644 --- a/src/mesa/drivers/dri/sis/sis_dd.c +++ b/src/mesa/drivers/dri/sis/sis_dd.c @@ -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; } diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c index 62498fb874..183f3d3479 100644 --- a/src/mesa/drivers/dri/unichrome/via_context.c +++ b/src/mesa/drivers/dri/unichrome/via_context.c @@ -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; } |