src/sdl/ogl_sdl.c

@@ -69,7 +69,6 @@ PFNglGetString pglGetString;
 
 /**	\brief SDL video display surface
 */
-INT32 oglflags = 0;
 void *GLUhandle = NULL;
 SDL_GLContext sdlglcontext = 0;
 
@@ -156,20 +155,18 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 	INT32 cbpp = cv_scr_depth.value < 16 ? 16 : cv_scr_depth.value;
 	static boolean first_init = false;
 
-	oglflags = 0;
-
 	if (!first_init)
 	{
-		gl_version = pglGetString(GL_VERSION);
-		gl_renderer = pglGetString(GL_RENDERER);
-		gl_extensions = pglGetString(GL_EXTENSIONS);
+		GLVersion = pglGetString(GL_VERSION);
+		GLRenderer = pglGetString(GL_RENDERER);
+		GLExtensions = pglGetString(GL_EXTENSIONS);
 
-		GL_DBG_Printf("OpenGL %s\n", gl_version);
-		GL_DBG_Printf("GPU: %s\n", gl_renderer);
-		GL_DBG_Printf("Extensions: %s\n", gl_extensions);
+		GL_DBG_Printf("OpenGL %s\n", GLVersion);
+		GL_DBG_Printf("GPU: %s\n", GLRenderer);
+		GL_DBG_Printf("Extensions: %s\n", GLExtensions);
 
-		if (strcmp((const char*)gl_renderer, "GDI Generic") == 0 &&
-			strcmp((const char*)gl_version, "1.1.0") == 0)
+		if (strcmp((const char*)GLRenderer, "GDI Generic") == 0 &&
+			strcmp((const char*)GLVersion, "1.1.0") == 0)
 		{
 			// Oh no... Windows gave us the GDI Generic rasterizer, so something is wrong...
 			// The game will crash later on when unsupported OpenGL commands are encountered.
@@ -182,14 +179,14 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 	}
 	first_init = true;
 
-	if (isExtAvailable("GL_EXT_texture_filter_anisotropic", gl_extensions))
-		pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &maximumAnisotropy);
+	if (isExtAvailable("GL_EXT_texture_filter_anisotropic", GLExtensions))
+		pglGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &GPUMaximumAnisotropy);
 	else
-		maximumAnisotropy = 1;
+		GPUMaximumAnisotropy = 1;
 
 	SetupGLFunc4();
 
-	glanisotropicmode_cons_t[1].value = maximumAnisotropy;
+	glanisotropicmode_cons_t[1].value = GPUMaximumAnisotropy;
 
 	SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0);
 
@@ -198,7 +195,7 @@ boolean OglSdlSurface(INT32 w, INT32 h)
 	pglClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
 	HWR_Startup();
-	textureformatGL = cbpp > 16 ? GL_RGBA : GL_RGB5_A1;
+	GPUTextureFormat = cbpp > 16 ? GL_RGBA : GL_RGB5_A1;
 
 	return true;
 }
@@ -237,9 +234,9 @@ EXPORT void HWRAPI(OglSdlSetPalette) (RGBA_t *palette)
 {
 	size_t palsize = (sizeof(RGBA_t) * 256);
 	// on a palette change, you have to reload all of the textures
-	if (memcmp(&myPaletteData, palette, palsize))
+	if (memcmp(&GPUTexturePalette, palette, palsize))
 	{
-		memcpy(&myPaletteData, palette, palsize);
+		memcpy(&GPUTexturePalette, palette, palsize);
 		Flush();
 	}
 }

src/win32/win_dll.c

@@ -110,9 +110,8 @@ static loadfunc_t hwdFuncTable[] = {
 	{"DeleteTexture@4",     &hwdriver.pfnDeleteTexture},
 	{"ReadRect@24",         &hwdriver.pfnReadRect},
 	{"GClipRect@20",        &hwdriver.pfnGClipRect},
-	{"ClearMipMapCache@0",  &hwdriver.pfnClearMipMapCache},
-	{"ClearCacheList@0",    &hwdriver.pfnClearCacheList},
-	{"SetSpecialState@8",   &hwdriver.pfnSetSpecialState},
+	{"ClearTextureCache@0", &hwdriver.pfnClearTextureCache},
+	{"SetState@8",          &hwdriver.pfnSetState},
 	{"DrawModel@16",        &hwdriver.pfnDrawModel},
 	{"SetTransform@4",      &hwdriver.pfnSetTransform},
 	{"GetTextureUsed@0",    &hwdriver.pfnGetTextureUsed},
@@ -144,9 +143,8 @@ static loadfunc_t hwdFuncTable[] = {
 	{"DeleteTexture",       &hwdriver.pfnDeleteTexture},
 	{"ReadRect",            &hwdriver.pfnReadRect},
 	{"GClipRect",           &hwdriver.pfnGClipRect},
-	{"ClearMipMapCache",    &hwdriver.pfnClearMipMapCache},
-	{"ClearCacheList",      &hwdriver.pfnClearCacheList},
-	{"SetSpecialState",     &hwdriver.pfnSetSpecialState},
+	{"ClearTextureCache",   &hwdriver.pfnClearTextureCache},
+	{"SetState",            &hwdriver.pfnSetState},
 	{"DrawModel",           &hwdriver.pfnDrawModel},
 	{"SetTransform",        &hwdriver.pfnSetTransform},
 	{"GetTextureUsed",      &hwdriver.pfnGetTextureUsed},

src/z_zone.c

@@ -815,7 +815,7 @@ static void Command_Memfree_f(void)
 	{
 		CONS_Printf(M_GetText("Patch info headers     : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHINFO)>>10));
 		CONS_Printf(M_GetText("Cached textures        : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRCACHE)>>10));
-		CONS_Printf(M_GetText("Texture colormaps      : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHCOLMIPMAP)>>10));
+		CONS_Printf(M_GetText("Texture colormaps      : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPATCHCOLTEXTURE)>>10));
 		CONS_Printf(M_GetText("Model textures         : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRMODELTEXTURE)>>10));
 		CONS_Printf(M_GetText("Plane polygons         : %7s KB\n"), sizeu1(Z_TagUsage(PU_HWRPLANE)>>10));
 		CONS_Printf(M_GetText("All GPU textures       : %7d KB\n"), HWR_GetTextureUsed()>>10);

src/z_zone.h

@@ -51,7 +51,7 @@ enum
 	PU_HUDGFX                = 19, // HUD patch, static until WAD added
 
 	PU_HWRPATCHINFO          = 21, // Hardware GLPatch_t struct for OpenGL texture cache
-	PU_HWRPATCHCOLMIPMAP     = 22, // Hardware GLMipmap_t struct colormap variation of patch
+	PU_HWRPATCHCOLTEXTURE    = 22, // Hardware HWRTexture_t struct colormap variation of patch
 	PU_HWRMODELTEXTURE       = 23, // Hardware model texture
 
 	PU_HWRCACHE              = 48, // static until unlocked