removed old Depth buffer pointer var
This commit is contained in:
parent
46f717f949
commit
650cb74bcb
|
@ -1,4 +1,4 @@
|
|||
/* $Id: osmesa.c,v 1.10 2000/03/03 17:50:09 brianp Exp $ */
|
||||
/* $Id: osmesa.c,v 1.11 2000/03/17 15:32:29 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
@ -492,7 +492,7 @@ void GLAPIENTRY OSMesaGetBooleanv( GLint pname, GLboolean *value )
|
|||
GLboolean GLAPIENTRY OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint *height,
|
||||
GLint *bytesPerValue, void **buffer )
|
||||
{
|
||||
if ((!c->gl_buffer) || (!c->gl_buffer->Depth)) {
|
||||
if ((!c->gl_buffer) || (!c->gl_buffer->DepthBuffer)) {
|
||||
*width = 0;
|
||||
*height = 0;
|
||||
*bytesPerValue = 0;
|
||||
|
@ -503,7 +503,7 @@ GLboolean GLAPIENTRY OSMesaGetDepthBuffer( OSMesaContext c, GLint *width, GLint
|
|||
*width = c->gl_buffer->Width;
|
||||
*height = c->gl_buffer->Height;
|
||||
*bytesPerValue = sizeof(GLdepth);
|
||||
*buffer = c->gl_buffer->Depth;
|
||||
*buffer = c->gl_buffer->DepthBuffer;
|
||||
return GL_TRUE;
|
||||
}
|
||||
}
|
||||
|
@ -1838,6 +1838,8 @@ static void osmesa_update_state( GLcontext *ctx )
|
|||
(ctx->Color.ColorMask[3] == 0) &&
|
||||
(ctx->Stencil.Enabled == GL_FALSE)) {
|
||||
|
||||
/* XXX depth.func == GL_LESS ? */
|
||||
|
||||
ctx->Driver.WriteCI32Span = write_index32_span_occ;
|
||||
ctx->Driver.WriteCI8Span = write_index8_span_occ;
|
||||
ctx->Driver.WriteMonoCISpan = write_monoindex_span_occ;
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue