summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/context.c6
-rw-r--r--src/mesa/main/depth.c10
2 files changed, 7 insertions, 9 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 64d236ee518..f770326c39f 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.46 2000/03/11 23:23:26 brianp Exp $ */
+/* $Id: context.c,v 1.47 2000/03/17 15:31:52 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -405,8 +405,8 @@ GLframebuffer *gl_create_framebuffer( GLvisual *visual,
void gl_destroy_framebuffer( GLframebuffer *buffer )
{
if (buffer) {
- if (buffer->Depth) {
- FREE( buffer->Depth );
+ if (buffer->DepthBuffer) {
+ FREE( buffer->DepthBuffer );
}
if (buffer->Accum) {
FREE( buffer->Accum );
diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index ba7f6248ab1..57937dd0930 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -1,4 +1,4 @@
-/* $Id: depth.c,v 1.13 2000/03/03 17:47:39 brianp Exp $ */
+/* $Id: depth.c,v 1.14 2000/03/17 15:31:52 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -1483,10 +1483,9 @@ _mesa_alloc_depth_buffer( GLcontext *ctx )
if (ctx->DrawBuffer->UseSoftwareDepthBuffer) {
GLint bytesPerValue;
- if (ctx->DrawBuffer->Depth) {
- FREE(ctx->DrawBuffer->Depth);
+ if (ctx->DrawBuffer->DepthBuffer) {
+ FREE(ctx->DrawBuffer->DepthBuffer);
ctx->DrawBuffer->DepthBuffer = NULL;
- ctx->DrawBuffer->Depth = NULL;
}
/* allocate new depth buffer, but don't initialize it */
@@ -1498,9 +1497,8 @@ _mesa_alloc_depth_buffer( GLcontext *ctx )
ctx->DrawBuffer->DepthBuffer = MALLOC( ctx->DrawBuffer->Width
* ctx->DrawBuffer->Height
* bytesPerValue );
- ctx->DrawBuffer->Depth = (GLdepth *) ctx->DrawBuffer->DepthBuffer;
- if (!ctx->DrawBuffer->Depth) {
+ if (!ctx->DrawBuffer->DepthBuffer) {
/* out of memory */
ctx->Depth.Test = GL_FALSE;
ctx->NewState |= NEW_RASTER_OPS;