summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2000-04-15 23:04:11 +0000
committerBrian Paul <[email protected]>2000-04-15 23:04:11 +0000
commitbc95b628fe86594b24a3663086101f43914ad561 (patch)
tree0873016985fff133b421547c9cd0c34791810419 /src/mesa/drivers
parent825fb31e58c822b0c63cc478e8c503cad37f6ea1 (diff)
wrapper for grTexLodBiasValue()
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/glide/fxddtex.c4
-rw-r--r--src/mesa/drivers/glide/fxglidew.h13
2 files changed, 13 insertions, 4 deletions
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index 6f817ccaa39..3745312923c 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -176,10 +176,10 @@ void fxDDTexEnv(GLcontext *ctx, GLenum target, GLenum pname, const GLfloat *para
/* apply any lod biasing right now */
if (pname==GL_TEXTURE_LOD_BIAS_EXT) {
- grTexLodBiasValue(GR_TMU0,*param);
+ FX_grTexLodBiasValue(GR_TMU0,*param);
if(fxMesa->haveTwoTMUs) {
- grTexLodBiasValue(GR_TMU1,*param);
+ FX_grTexLodBiasValue(GR_TMU1,*param);
}
}
diff --git a/src/mesa/drivers/glide/fxglidew.h b/src/mesa/drivers/glide/fxglidew.h
index 28556d8c58d..6da1ea5f309 100644
--- a/src/mesa/drivers/glide/fxglidew.h
+++ b/src/mesa/drivers/glide/fxglidew.h
@@ -821,9 +821,18 @@ extern FxU32 FX_grTexTextureMemRequired(FxU32 evenOdd, GrTexInfo *info);
#define FX_grGlideShutdown() \
do { \
- BEGIN_CLIP_LOOP(); \
+ BEGIN_BOARD_LOCK(); \
grGlideShutdown(); \
- END_CLIP_LOOP(); \
+ END_BOARD_LOCK(); \
+ } while (0)
+
+#define FX_grTexLodBiasValue_NoLock(t, v) grTexLodBiasValue(t, v)
+
+#define FX_grTexLodBiasValue(t, v) \
+ do { \
+ BEGIN_BOARD_LOCK(); \
+ grTexLodBiasValue(t, v); \
+ END_BOARD_LOCK(); \
} while (0)
#define FX_grGlideInit_NoLock grGlideInit