Mesa (gallium-0.2): r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.
Jonathan White
jwhitetg at kemper.freedesktop.org
Mon Sep 22 16:52:28 UTC 2008
Module: Mesa
Branch: gallium-0.2
Commit: bb60fb77c7fa02e0018e10eb84c6ef7c6a5d551b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bb60fb77c7fa02e0018e10eb84c6ef7c6a5d551b
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Mon Sep 22 11:49:34 2008 +0200
r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.
---
src/mesa/drivers/dri/r300/r300_context.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 0ff249c..ee4a69d 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -355,7 +355,7 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual,
ctx->Const.FragmentProgram.MaxNativeTexIndirections =
PFS_MAX_TEX_INDIRECT;
ctx->Const.FragmentProgram.MaxNativeAddressRegs = 0; /* and these are?? */
- _tnl_ProgramCacheInit(ctx);
+ ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
driInitExtensions(ctx, card_extensions, GL_TRUE);
@@ -501,7 +501,6 @@ void r300DestroyContext(__DRIcontextPrivate * driContextPriv)
release_texture_heaps =
(r300->radeon.glCtx->Shared->RefCount == 1);
_swsetup_DestroyContext(r300->radeon.glCtx);
- _tnl_ProgramCacheDestroy(r300->radeon.glCtx);
_tnl_DestroyContext(r300->radeon.glCtx);
_vbo_DestroyContext(r300->radeon.glCtx);
_swrast_DestroyContext(r300->radeon.glCtx);
More information about the mesa-commit
mailing list