masked out unsupported glBlendColor (some games check only the proc addr)

7 files changed, 16 insertions, 9 deletions

diff --git a/docs/README.3DFX b/docs/README.3DFX
index 120e3ea23f9..69c16560eb9 100644
--- a/docs/README.3DFX
+++ b/docs/README.3DFX
@@ -185,6 +185,11 @@ MESA_FX_MAXLOD
 	    "9"  - 512x512 textures
 	    "10" - 1024x1024 textures
 	    "11" - 2048x2048 textures
+MESA_3DFX_STRING
+	OS: all
+	HW: all
+	Desc: advertise "3dfx" substring in GL_RENDERER
+	Note: used by some games aware by 3dfx hw limitations
 MESA_GLX_FX
 	OS: win32, linux
 	HW: selective
diff --git a/src/mesa/drivers/glide/fx.rc b/src/mesa/drivers/glide/fx.rc
index bace051686c..8c6dedff375 100644
--- a/src/mesa/drivers/glide/fx.rc
+++ b/src/mesa/drivers/glide/fx.rc
@@ -5,10 +5,10 @@
 #define HWSTR                   "3dfx Voodoo Graphics, Voodoo^2, Voodoo Banshee, Velocity 100/200, Voodoo3, Voodoo4, Voodoo5"
 #define COPYRIGHTSTR            "Copyright \251 Brian E. Paul"
 
-#define VERSIONSTR              "6.1.0.1"
+#define VERSIONSTR              "6.1.0.5"
 #define MANVERSION              6
 #define MANREVISION             1
-#define BUILD_NUMBER            1
+#define BUILD_NUMBER            5
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION MANVERSION, MANREVISION, 0, BUILD_NUMBER
diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c
index e827ec31ddc..47aa0464eb6 100644
--- a/src/mesa/drivers/glide/fxapi.c
+++ b/src/mesa/drivers/glide/fxapi.c
@@ -644,8 +644,9 @@ fxMesaCreateContext(GLuint win,
                       fxMesa->snapVertices ? "" : "no ");
    }
 
-  sprintf(fxMesa->rendererString, "Mesa %s v0.61 %s%s",
+  sprintf(fxMesa->rendererString, "Mesa %s v0.61 %s%s%s",
           grGetString(GR_RENDERER),
+          getenv("MESA_3DFX_STRING") ? "3dfx " : "",
           grGetString(GR_HARDWARE),
           ((fxMesa->type < GR_SSTTYPE_Voodoo4) && (voodoo->numChips > 1)) ? " SLI" : "");
 
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 37612a55ac0..214a57edb7b 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -738,6 +738,6 @@ extern int TDFX_DEBUG;
 
 /* dirty hacks */
 #define FX_RESCALE_BIG_TEXURES_HACK   1
-#define FX_COMPRESS_S3TC_AS_FXT1_HACK 0
+#define FX_COMPRESS_S3TC_AS_FXT1_HACK 1
 
 #endif
diff --git a/src/mesa/drivers/glide/fxg.c b/src/mesa/drivers/glide/fxg.c
index c06b8dec2fb..afb9441aded 100644
--- a/src/mesa/drivers/glide/fxg.c
+++ b/src/mesa/drivers/glide/fxg.c
@@ -1364,7 +1364,7 @@ void FX_CALL trap_grStippleMode (GrStippleMode_t mode)
 {
 #define FN_NAME "grStippleMode"
  TRAP_LOG("%s(%s)\n", FN_NAME, TRP_STIPPLEMODE(mode));
- grStippleMode(mode);
+ grStippleMode(mode); /* some Glide libs don't have it; not used anyway */
 #undef FN_NAME
 }
 
@@ -1372,7 +1372,7 @@ void FX_CALL trap_grStipplePattern (GrStipplePattern_t mode)
 {
 #define FN_NAME "grStipplePattern"
  TRAP_LOG("%s(%08lx)\n", FN_NAME, mode);
- grStipplePattern(mode);
+ grStipplePattern(mode); /* some Glide libs don't have it; not used anyway */
 #undef FN_NAME
 }
 
diff --git a/src/mesa/drivers/glide/fxopengl.def b/src/mesa/drivers/glide/fxopengl.def
index 86ff1001166..fecbb253cf9 100644
--- a/src/mesa/drivers/glide/fxopengl.def
+++ b/src/mesa/drivers/glide/fxopengl.def
@@ -19,8 +19,8 @@ EXPORTS
  glBindTexture
  glBindTextureEXT
  glBitmap
- glBlendColor
- glBlendColorEXT
+;glBlendColor
+;glBlendColorEXT
  glBlendEquation
  glBlendEquationEXT
  glBlendFunc
diff --git a/src/mesa/drivers/glide/fxwgl.c b/src/mesa/drivers/glide/fxwgl.c
index cb098fa2ef4..0b0197d3ecc 100644
--- a/src/mesa/drivers/glide/fxwgl.c
+++ b/src/mesa/drivers/glide/fxwgl.c
@@ -510,7 +510,8 @@ wglGetProcAddress(LPCSTR lpszProc)
    int i;
    PROC p = (PROC) _glapi_get_proc_address((const char *) lpszProc);
 
-   if (p)
+   /* [dBorca] we can't do BlendColor... yet */
+   if (p && strcmp(lpszProc, "glBlendColor") && strcmp(lpszProc, "glBlendColorEXT"))
       return p;
 
    for (i = 0; wgl_ext[i].name; i++) {