diff options
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/sis/sis_mesa.c')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/sis/sis_mesa.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c index 7e91e5fd2..ca09b153f 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_mesa.c @@ -1,3 +1,5 @@ +/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_mesa.c,v 1.3 2000/08/04 03:51:42 tsi Exp $ */ + #include "sis_ctx.h" #include "sis_mesa.h" #include "sis_lock.h" @@ -43,7 +45,9 @@ sis_RenderStart (GLcontext * ctx) sis_StartAGP (ctx); } - /* d2f_once (ctx); */ +#if defined(SIS_DUMP) + d2f_once (ctx); +#endif } void @@ -168,7 +172,7 @@ sis_init_driver (GLcontext * ctx) ctx->Driver.Bitmap = sis_Bitmap; /* Optimization */ -#if NOT_DONE +#ifdef NOT_DONE ctx->Driver.RasterSetup = sis_ChooseRasterSetupFunc(ctx); ctx->Driver.RegisterVB = sis_RegisterVB; ctx->Driver.UnregisterVB = sis_UnregisterVB; @@ -293,7 +297,7 @@ sis_UpdateState (GLcontext * ctx) } } -#if NOT_DONE +#ifdef NOT_DONE sis_set_render_vb_tabs(ctx); #endif @@ -645,7 +649,6 @@ sis_DepthMask (GLcontext * ctx, GLboolean flag) __GLSiSHardware *prev = &hwcx->prev; __GLSiSHardware *current = &hwcx->current; - /* TODO, in xfree 3.9.18, no ctx->Buffer */ if (ctx->Visual->StencilBits) { if (flag || ctx->Stencil.WriteMask) @@ -753,7 +756,7 @@ sis_Enable (GLcontext * ctx, GLenum cap, GLboolean state) #endif break; case GL_DEPTH_TEST: - if (state && xmesa->xm_buffer->gl_buffer->DepthBuffer) + if (state && xmesa->xm_buffer->depthbuffer) { current->hwCapEnable |= MASK_ZTestEnable; } @@ -1093,7 +1096,7 @@ sis_ColorMask (GLcontext * ctx, if (rmask & gmask & bmask & - (!xmesa->xm_visual->gl_visual->AlphaBits | amask)) + (!ctx->Visual->AlphaBits | amask)) { current->hwCapEnable2 &= ~(MASK_AlphaMaskWriteEnable | MASK_ColorMaskWriteEnable); @@ -1354,7 +1357,7 @@ sis_update_drawable_state (GLcontext * ctx) current->hwZ &= ~MASK_ZBufferPitch; current->hwZ |= xm_buffer->width * z_depth >> 2; /* TODO, in xfree 3.9.18, no ctx->Buffer */ - current->hwOffsetZ = ((DWORD) (ctx->DrawBuffer->DepthBuffer) - + current->hwOffsetZ = ((DWORD) (xm_buffer->depthbuffer) - (DWORD) GET_FbBase (hwcx)) >> 2; if ((current->hwOffsetZ ^ prev->hwOffsetZ) @@ -1422,7 +1425,7 @@ sis_GetBufferSize (GLcontext * ctx, GLuint * width, GLuint * height) &priv->cbClearPacket); } - if (xm_buffer->xm_visual->gl_visual->DepthBits) + if (ctx->Visual->DepthBits) sis_alloc_z_stencil_buffer (ctx); switch (hwcx->zFormat) @@ -1444,7 +1447,7 @@ sis_GetBufferSize (GLcontext * ctx, GLuint * width, GLuint * height) current->hwZ &= ~MASK_ZBufferPitch; current->hwZ |= xm_buffer->width * z_depth >> 2; /* TODO, in xfree 3.9.18, no ctx->Buffer */ - current->hwOffsetZ = ((DWORD) (ctx->DrawBuffer->DepthBuffer) - + current->hwOffsetZ = ((DWORD) (xm_buffer->depthbuffer) - (DWORD) GET_FbBase (hwcx)) >> 2; if ((current->hwOffsetZ ^ prev->hwOffsetZ) |