removed legacy Windows OpenGL init code.

ZDoom · Jan 6, 2024 · 218a617 · 218a617
1 parent a496332
commit 218a617
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 41 deletions.
diff --git a/source/common/filesystem/source/fs_stringpool.h b/source/common/filesystem/source/fs_stringpool.h
@@ -8,7 +8,7 @@ class StringPool
 	friend class FileSystem;
 	friend class FResourceFile;
 private:
-	StringPool(bool _shared, size_t blocksize = 10*1024) : TopBlock(nullptr), FreeBlocks(nullptr), BlockSize(blocksize), shared(_shared) {}
+	StringPool(bool _shared, size_t blocksize = 10*1024) : TopBlock(nullptr), BlockSize(blocksize), shared(_shared) {}
 public:
 	~StringPool();
 	const char* Strdup(const char*);
@@ -20,7 +20,6 @@ class StringPool
 	Block *AddBlock(size_t size);
 
 	Block *TopBlock;
-	Block *FreeBlocks;
 	size_t BlockSize;
 public:
 	bool shared;

diff --git a/source/common/platform/win32/win32glvideo.cpp b/source/common/platform/win32/win32glvideo.cpp
@@ -326,8 +326,7 @@ bool Win32GLVideo::SetupPixelFormat(int multisample)
 
 		if (!myWglChoosePixelFormatARB(m_hDC, attributes.data(), attribsFloat, 1, &pixelFormat, &numFormats))
 		{
-			Printf("R_OPENGL: Couldn't choose pixel format. Retrying in compatibility mode\n");
-			goto oldmethod;
+			I_FatalError("R_OPENGL: Couldn't choose pixel format. Retrying in compatibility mode\n");
 		}
 
 		if (vid_hdr && numFormats == 0) // This card/driver doesn't support the rgb16f pixel format. Fall back to 8bpc
@@ -343,8 +342,7 @@ bool Win32GLVideo::SetupPixelFormat(int multisample)
 
 			if (!myWglChoosePixelFormatARB(m_hDC, attributes.data(), attribsFloat, 1, &pixelFormat, &numFormats))
 			{
-				Printf("R_OPENGL: Couldn't choose pixel format. Retrying in compatibility mode\n");
-				goto oldmethod;
+				I_FatalError("R_OPENGL: Couldn't choose pixel format.");
 			}
 		}
 		else if (vid_hdr)
@@ -360,41 +358,12 @@ bool Win32GLVideo::SetupPixelFormat(int multisample)
 				vr_enable_quadbuffered = false;
 				goto again;
 			}
-			Printf("R_OPENGL: No valid pixel formats found. Retrying in compatibility mode\n");
-			goto oldmethod;
+			I_FatalError("R_OPENGL: No valid pixel formats found.");
 		}
 	}
 	else
 	{
-	oldmethod:
-		// If wglChoosePixelFormatARB is not found we have to do it the old fashioned way.
-		static PIXELFORMATDESCRIPTOR pfd = {
-			sizeof(PIXELFORMATDESCRIPTOR),
-			1,
-			PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,
-			PFD_TYPE_RGBA,
-			32, // color depth
-			0, 0, 0, 0, 0, 0,
-			0,
-			0,
-			0,
-			0, 0, 0, 0,
-			32, // z depth
-			8, // stencil buffer
-			0,
-			PFD_MAIN_PLANE,
-			0,
-			0, 0, 0
-		};
-
-		pixelFormat = ChoosePixelFormat(m_hDC, &pfd);
-		DescribePixelFormat(m_hDC, pixelFormat, sizeof(pfd), &pfd);
-
-		if (pfd.dwFlags & PFD_GENERIC_FORMAT)
-		{
-			I_Error("R_OPENGL: OpenGL driver not accelerated!");
-			return false;
-		}
+		I_FatalError("R_OPENGL: Unable to create an OpenGL render context. Insufficient driver support for context creation\n");
 	}
 
 	if (!::SetPixelFormat(m_hDC, pixelFormat, NULL))
@@ -452,8 +421,7 @@ bool Win32GLVideo::InitHardware(HWND Window, int multisample)
 			m_hRC = zd_wglCreateContext(m_hDC);
 			if (m_hRC == NULL)
 			{
-				I_Error("R_OPENGL: Unable to create an OpenGL render context.\n");
-				return false;
+				I_FatalError("R_OPENGL: Unable to create an OpenGL render context.\n");
 			}
 		}
 
@@ -464,7 +432,7 @@ bool Win32GLVideo::InitHardware(HWND Window, int multisample)
 		}
 	}
 	// We get here if the driver doesn't support the modern context creation API which always means an old driver.
-	I_Error("R_OPENGL: Unable to create an OpenGL render context. Insufficient driver support for context creation\n");
+	I_FatalError("R_OPENGL: Unable to create an OpenGL render context. Insufficient driver support for context creation\n");
 	return false;
 }
 

diff --git a/source/common/scripting/core/types.cpp b/source/common/scripting/core/types.cpp
@@ -116,7 +116,7 @@ void DumpTypeTable()
 		}
 		Printf("\n");
 	}
-	Printf("Used buckets: %d/%lu (%.2f%%) for %d entries\n", used, countof(TypeTable.TypeHash), double(used)/countof(TypeTable.TypeHash)*100, all);
+	Printf("Used buckets: %d/%zu (%.2f%%) for %d entries\n", used, countof(TypeTable.TypeHash), double(used)/countof(TypeTable.TypeHash)*100, all);
 	Printf("Min bucket size: %d\n", min);
 	Printf("Max bucket size: %d\n", max);
 	Printf("Avg bucket size: %.2f\n", double(all) / used);