Fixes

beyond-all-reason · Jan 2, 2025 · 9186e8a · 9186e8a
1 parent 51a0205
commit 9186e8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/rts/Map/SMF/SMFGroundTextures.cpp b/rts/Map/SMF/SMFGroundTextures.cpp
@@ -180,7 +180,7 @@ void CSMFGroundTextures::LoadTiles(CSMFMapFile& file)
 	}
 
 
-#if !defined(HEADLESS) && defined(GLAD_GL_ARB_ES3_compatibility)
+#if !defined(HEADLESS) && defined(GL_ARB_ES3_compatibility)
 	if (RecompressTilesIfNeeded()) {
 		// Not all FOSS drivers support S3TC, use ETC1 for those if possible
 		// ETC2 is backward compatible with ETC1! GLEW doesn't have the ETC1 extension :<
@@ -285,12 +285,12 @@ void CSMFGroundTextures::ConvolveHeightMap(const int mapWidth, const int mipLeve
 	}
 }
 
-#if !defined(HEADLESS) && defined(GLAD_GL_ARB_ES3_compatibility)
+#if !defined(HEADLESS) && defined(GL_ARB_ES3_compatibility)
 // Not all FOSS drivers support S3TC, use ETC1 for those if possible
 bool CSMFGroundTextures::RecompressTilesIfNeeded()
 {
 	// if DXT1 is supported, we don't need to recompress
-	if (GLAD_GL_EXT_texture_compression_s3tc || GLAD_GL_EXT_texture_compression_dxt1)
+	if (GLAD_GL_EXT_texture_compression_s3tc)
 		return false;
 
 	// check if ETC1/2 is supported

diff --git a/rts/Rendering/GL/myGL.cpp b/rts/Rendering/GL/myGL.cpp
@@ -121,7 +121,7 @@ bool CheckAvailableVideoModes()
 static bool GetVideoMemInfoNV(GLint* memInfo)
 {
 	RECOIL_DETAILED_TRACY_ZONE;
-	#if (defined(GLAD_GL_NVX_gpu_memory_info))
+	#if (defined(GL_NVX_gpu_memory_info))
 	if (!GLAD_GL_NVX_gpu_memory_info)
 		return false;
 
@@ -136,7 +136,7 @@ static bool GetVideoMemInfoNV(GLint* memInfo)
 static bool GetVideoMemInfoATI(GLint* memInfo)
 {
 	RECOIL_DETAILED_TRACY_ZONE;
-	#if (defined(GLAD_GL_ATI_meminfo))
+	#if (defined(GL_ATI_meminfo))
 	if (!GLAD_GL_ATI_meminfo)
 		return false;