[Video] Remove grGetString

Source/Project64-video/Combine.cpp

@@ -15908,26 +15908,20 @@ void InitCombine()
 {
     WriteTrace(TraceGlide64, TraceDebug, "-");
     memset(&cmb, 0, sizeof(cmb));
-    const char *extensions = grGetString(GR_EXTENSION);
+    cmb.grColorCombineExt = (GRCOLORCOMBINEEXT)grColorCombineExt;
-    if (const char * extstr = strstr(extensions, "COMBINE")) {
+    cmb.grAlphaCombineExt = (GRCOLORCOMBINEEXT)grAlphaCombineExt;
-        if (!strncmp(extstr, "COMBINE", 7)) {
+    cmb.grTexColorCombineExt = (GRTEXCOLORCOMBINEEXT)grTexColorCombineExt;
-            WriteTrace(TraceGlide64, TraceDebug, "extensions");
+    cmb.grTexAlphaCombineExt = (GRTEXCOLORCOMBINEEXT)grTexAlphaCombineExt;
-            cmb.grColorCombineExt = (GRCOLORCOMBINEEXT)grColorCombineExt;
+    cmb.grConstantColorValueExt = (GRCONSTANTCOLORVALUEEXT)grConstantColorValueExt;
-            cmb.grAlphaCombineExt = (GRCOLORCOMBINEEXT)grAlphaCombineExt;
+    if (cmb.grColorCombineExt && cmb.grAlphaCombineExt &&
-            cmb.grTexColorCombineExt = (GRTEXCOLORCOMBINEEXT)grTexColorCombineExt;
+        cmb.grTexColorCombineExt && cmb.grTexAlphaCombineExt)
-            cmb.grTexAlphaCombineExt = (GRTEXCOLORCOMBINEEXT)grTexAlphaCombineExt;
+    {
-            cmb.grConstantColorValueExt = (GRCONSTANTCOLORVALUEEXT)grConstantColorValueExt;
+        cmb.combine_ext = TRUE;
-            if (cmb.grColorCombineExt && cmb.grAlphaCombineExt &&
+        WriteTrace(TraceGlide64, TraceDebug, "initialized.");
-                cmb.grTexColorCombineExt && cmb.grTexAlphaCombineExt)
+    }
-            {
+    else
-                cmb.combine_ext = TRUE;
+    {
-                WriteTrace(TraceGlide64, TraceDebug, "initialized.");
+        cmb.combine_ext = FALSE;
-            }
-            else
-            {
-                cmb.combine_ext = FALSE;
-            }
-        }
     }
     cmb.dc0_lodbias = cmb.dc1_lodbias = 31;
     cmb.dc0_detailscale = cmb.dc1_detailscale = 7;

Source/Project64-video/Main.cpp

@@ -464,9 +464,6 @@ int InitGfx()
     // Initialize Glide
     grGlideInit();
 
-    // Is mirroring allowed?
-    const char *extensions = grGetString(GR_EXTENSION);
-
     // Check which SST we are using and initialize stuff
     // Hiroshi Morii <koolsmoky@users.sourceforge.net>
     enum {
@@ -479,37 +476,15 @@ int InitGfx()
         GR_SSTTYPE_Voodoo4 = 6,
         GR_SSTTYPE_Voodoo5 = 7
     };
-    const char *hardware = grGetString(GR_HARDWARE);
+    unsigned int SST_type = GR_SSTTYPE_Voodoo5;
-    unsigned int SST_type = GR_SSTTYPE_VOODOO;
-    if (strstr(hardware, "Rush")) {
-        SST_type = GR_SSTTYPE_SST96;
-    }
-    else if (strstr(hardware, "Voodoo2")) {
-        SST_type = GR_SSTTYPE_Voodoo2;
-    }
-    else if (strstr(hardware, "Voodoo Banshee")) {
-        SST_type = GR_SSTTYPE_Banshee;
-    }
-    else if (strstr(hardware, "Voodoo3")) {
-        SST_type = GR_SSTTYPE_Voodoo3;
-    }
-    else if (strstr(hardware, "Voodoo4")) {
-        SST_type = GR_SSTTYPE_Voodoo4;
-    }
-    else if (strstr(hardware, "Voodoo5")) {
-        SST_type = GR_SSTTYPE_Voodoo5;
-    }
     // 2Mb Texture boundary
     voodoo.has_2mb_tex_boundary = (SST_type < GR_SSTTYPE_Banshee) && !evoodoo;
     // use UMA if available
     voodoo.tex_UMA = FALSE;
-    if (strstr(extensions, " TEXUMA "))
+    // we get better texture cache hits with UMA on
-    {
+    grEnable(GR_TEXTURE_UMA_EXT);
-        // we get better texture cache hits with UMA on
+    voodoo.tex_UMA = TRUE;
-        grEnable(GR_TEXTURE_UMA_EXT);
+    WriteTrace(TraceGlide64, TraceDebug, "Using TEXUMA extension");
-        voodoo.tex_UMA = TRUE;
-        WriteTrace(TraceGlide64, TraceDebug, "Using TEXUMA extension");
-    }
 
     ChangeSize();
 #ifndef ANDROID
@@ -547,19 +522,15 @@ int InitGfx()
         voodoo.tex_max_addr[1] = grTexMaxAddress(GR_TMU1);
     }
 
-    if (strstr(extensions, "TEXMIRROR") && !g_settings->hacks(CSettings::hack_Zelda)) //zelda's trees suffer from hardware mirroring
+    // Is mirroring allowed?
+    if (!g_settings->hacks(CSettings::hack_Zelda)) //zelda's trees suffer from hardware mirroring
         voodoo.sup_mirroring = 1;
     else
         voodoo.sup_mirroring = 0;
 
-    if (strstr(extensions, "TEXFMT"))  //VSA100 texture format extension
+    voodoo.sup_32bit_tex = TRUE;
-        voodoo.sup_32bit_tex = TRUE;
-    else
-        voodoo.sup_32bit_tex = FALSE;
-
     voodoo.gamma_correction = 0;
-    if (strstr(extensions, "GETGAMMA"))
+    grGet(GR_GAMMA_TABLE_ENTRIES, sizeof(voodoo.gamma_table_size), &voodoo.gamma_table_size);
-        grGet(GR_GAMMA_TABLE_ENTRIES, sizeof(voodoo.gamma_table_size), &voodoo.gamma_table_size);
 
     srand(g_settings->stipple_pattern());
     setPattern();
@@ -586,30 +557,23 @@ int InitGfx()
 
     if (g_settings->fog()) //"FOGCOORD" extension
     {
-        if (strstr(extensions, "FOGCOORD"))
+        GrFog_t fog_t[64];
-        {
+        guFogGenerateLinear(fog_t, 0.0f, 255.0f);//(float)rdp.fog_multiplier + (float)rdp.fog_offset);//256.0f);
-            GrFog_t fog_t[64];
-            guFogGenerateLinear(fog_t, 0.0f, 255.0f);//(float)rdp.fog_multiplier + (float)rdp.fog_offset);//256.0f);
 
-            for (int i = 63; i > 0; i--)
+        for (int i = 63; i > 0; i--)
-            {
-                if (fog_t[i] - fog_t[i - 1] > 63)
-                {
-                    fog_t[i - 1] = fog_t[i] - 63;
-                }
-            }
-            fog_t[0] = 0;
-            //      for (int f = 0; f < 64; f++)
-            //      {
-            //        WriteTrace(TraceRDP, TraceDebug, "fog[%d]=%d->%f", f, fog_t[f], guFogTableIndexToW(f));
-            //      }
-            grFogTable(fog_t);
-            grVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE);
-        }
-        else //not supported
         {
-            g_settings->SetFog(FALSE);
+            if (fog_t[i] - fog_t[i - 1] > 63)
+            {
+                fog_t[i - 1] = fog_t[i] - 63;
+            }
         }
+        fog_t[0] = 0;
+        //      for (int f = 0; f < 64; f++)
+        //      {
+        //        WriteTrace(TraceRDP, TraceDebug, "fog[%d]=%d->%f", f, fog_t[f], guFogTableIndexToW(f));
+        //      }
+        grFogTable(fog_t);
+        grVertexLayout(GR_PARAM_FOG_EXT, offsetof(VERTEX, f), GR_PARAM_ENABLE);
     }
 
     grDepthBufferMode(GR_DEPTHBUFFER_ZBUFFER);
@@ -696,7 +660,7 @@ int InitGfx()
                 DisplayLoadProgress);
         }
     }
-    if (g_ghq_use && strstr(extensions, "TEXMIRROR"))
+    if (g_ghq_use)
     {
         voodoo.sup_mirroring = 1;
     }
@@ -1001,18 +965,9 @@ int CALL InitiateGFX(GFX_INFO Gfx_Info)
 
     grConfigWrapperExt(g_settings->wrpVRAM() * 1024 * 1024, g_settings->wrpFBO(), g_settings->wrpAnisotropic());
     grGlideInit();
-    const char *extensions = grGetString(GR_EXTENSION);
     grGlideShutdown();
-    if (strstr(extensions, "EVOODOO"))
+    evoodoo = 1;
-    {
+    voodoo.has_2mb_tex_boundary = 0;
-        evoodoo = 1;
-        voodoo.has_2mb_tex_boundary = 0;
-    }
-    else
-    {
-        evoodoo = 0;
-        voodoo.has_2mb_tex_boundary = 1;
-    }
     return TRUE;
 }
 
@@ -1153,14 +1108,8 @@ void CALL RomOpen(void)
     {
         grGlideInit();
     }
-    const char *extensions = grGetString(GR_EXTENSION);
     grGlideShutdown();
-
+    evoodoo = 1;
-    if (strstr(extensions, "EVOODOO"))
-        evoodoo = 1;
-    else
-        evoodoo = 0;
-
     InitGfx();
 }
 

Source/Project64-video/Renderer/OGLESglitchmain.cpp

@@ -1055,48 +1055,6 @@ grGet(FxU32 pname, FxU32 plength, FxI32 *params)
     return 0;
 }
 
-FX_ENTRY const char * FX_CALL
-grGetString(FxU32 pname)
-{
-    WriteTrace(TraceGlitch, TraceDebug, "pname: %d", pname);
-    switch (pname)
-    {
-    case GR_EXTENSION:
-    {
-        static char extension[] = "CHROMARANGE TEXCHROMA TEXMIRROR PALETTE6666 FOGCOORD EVOODOO TEXTUREBUFFER TEXUMA TEXFMT COMBINE GETGAMMA";
-        return extension;
-    }
-    break;
-    case GR_HARDWARE:
-    {
-        static char hardware[] = "Voodoo5 (tm)";
-        return hardware;
-    }
-    break;
-    case GR_VENDOR:
-    {
-        static char vendor[] = "3Dfx Interactive";
-        return vendor;
-    }
-    break;
-    case GR_RENDERER:
-    {
-        static char renderer[] = "Glide";
-        return renderer;
-    }
-    break;
-    case GR_VERSION:
-    {
-        static char version[] = "3.0";
-        return version;
-    }
-    break;
-    default:
-        WriteTrace(TraceGlitch, TraceWarning, "unknown grGetString selector : %x", pname);
-    }
-    return NULL;
-}
-
 static void render_rectangle(int texture_number,
     int dst_x, int dst_y,
     int src_width, int src_height,

Source/Project64-video/Renderer/OGLglitchmain.cpp

@@ -1359,48 +1359,6 @@ grGet(FxU32 pname, FxU32 plength, FxI32 *params)
     return 0;
 }
 
-FX_ENTRY const char * FX_CALL
-grGetString(FxU32 pname)
-{
-    WriteTrace(TraceGlitch, TraceDebug, "pname: %d", pname);
-    switch (pname)
-    {
-    case GR_EXTENSION:
-    {
-        static char extension[] = "CHROMARANGE TEXCHROMA TEXMIRROR PALETTE6666 FOGCOORD EVOODOO TEXTUREBUFFER TEXUMA TEXFMT COMBINE GETGAMMA";
-        return extension;
-    }
-    break;
-    case GR_HARDWARE:
-    {
-        static char hardware[] = "Voodoo5 (tm)";
-        return hardware;
-    }
-    break;
-    case GR_VENDOR:
-    {
-        static char vendor[] = "3Dfx Interactive";
-        return vendor;
-    }
-    break;
-    case GR_RENDERER:
-    {
-        static char renderer[] = "Glide";
-        return renderer;
-    }
-    break;
-    case GR_VERSION:
-    {
-        static char version[] = "3.0";
-        return version;
-    }
-    break;
-    default:
-        WriteTrace(TraceGlitch, TraceWarning, "unknown grGetString selector : %x", pname);
-    }
-    return NULL;
-}
-
 static void render_rectangle(int texture_number,
     int dst_x, int dst_y,
     int src_width, int src_height,