2 files changed, 18 insertions, 15 deletions
diff --git a/src/mesa/drivers/glide/fxglidew.c b/src/mesa/drivers/glide/fxglidew.c
index 696b8eff6c7..574136a5cd0 100644
--- a/src/mesa/drivers/glide/fxglidew.c
+++ b/src/mesa/drivers/glide/fxglidew.c
@@ -147,6 +147,21 @@ extern FxU32 FX_grTexMaxAddress(GrChipID_t tmu) {
   return result;
 }
 
+FxBool FX_grSstControl(FxU32 code)
+{
+#if defined(FX_GLIDE3)
+  (void) code;
+  return 1;  /* OK? */
+#else
+  FxU32 result;
+  BEGIN_BOARD_LOCK();
+  result = grSstControl(code);
+  END_BOARD_LOCK();
+  return result;
+#endif
+}
+
+
 #if defined(FX_GLIDE3)
 
 void FX_grGammaCorrectionValue(float val)
@@ -155,11 +170,6 @@ void FX_grGammaCorrectionValue(float val)
 /* ToDo */
 }
 
-void FX_grSstControl(int par)
-{
-  (void)par;
-  /* ToDo */
-}
 int FX_getFogTableSize(void)
 {
    int result;
diff --git a/src/mesa/drivers/glide/fxglidew.h b/src/mesa/drivers/glide/fxglidew.h
index a03ff477a9b..fc41445db19 100644
--- a/src/mesa/drivers/glide/fxglidew.h
+++ b/src/mesa/drivers/glide/fxglidew.h
@@ -482,19 +482,12 @@ typedef struct
 #else
 	#define FX_setupGrVertexLayout()		do {} while (0)
 #endif
+
 /*
  * grSstControl stuff
  */
-#if defined(FX_GLIDE3)
-	extern void FX_grSstControl(int par);
-#else
-	#define FX_grSstControl(p)	\
-	do {				\
-	  BEGIN_BOARD_LOCK();		\
-	  grSstControl(p);		\
-	  END_BOARD_LOCK();		\
-	} while (0)
-#endif
+extern FxBool FX_grSstControl(FxU32 code);
+
 /*
  * grGammaCorrectionValue
  */