From c6e00276041d0d6121a8114adaadc5ec33e4fa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Tue, 14 Mar 2023 16:09:40 +0100 Subject: [PATCH] OpenGL: Try a different way to exclude desktop compression formats in build May fix #17110 --- Common/GPU/OpenGL/DataFormatGL.cpp | 2 +- Common/GPU/OpenGL/GLFeatures.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Common/GPU/OpenGL/DataFormatGL.cpp b/Common/GPU/OpenGL/DataFormatGL.cpp index 67a4fdbc72ac..be3b8d8aa234 100644 --- a/Common/GPU/OpenGL/DataFormatGL.cpp +++ b/Common/GPU/OpenGL/DataFormatGL.cpp @@ -86,7 +86,7 @@ bool Thin3DFormatToGLFormatAndType(DataFormat fmt, GLuint &internalFormat, GLuin alignment = 16; break; -#if PPSSPP_PLATFORM(WINDOWS) +#ifndef USING_GLES2 case DataFormat::BC1_RGBA_UNORM_BLOCK: internalFormat = GL_COMPRESSED_RGB_S3TC_DXT1_EXT; format = GL_RGB; diff --git a/Common/GPU/OpenGL/GLFeatures.cpp b/Common/GPU/OpenGL/GLFeatures.cpp index 847778e51462..9b1e31337201 100644 --- a/Common/GPU/OpenGL/GLFeatures.cpp +++ b/Common/GPU/OpenGL/GLFeatures.cpp @@ -593,10 +593,8 @@ bool CheckGLExtensions() { switch (compressedFormats[i]) { case GL_COMPRESSED_RGB8_ETC2: gl_extensions.supportsETC2 = true; break; case GL_COMPRESSED_RGBA_ASTC_4x4_KHR: gl_extensions.supportsASTC = true; break; -#if !PPSSPP_PLATFORM(IOS) && !PPSSPP_PLATFORM(MAC) +#ifndef USING_GLES2 case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT: gl_extensions.supportsBC123 = true; break; -#endif -#if PPSSPP_PLATFORM(WINDOWS) case GL_COMPRESSED_RGBA_BPTC_UNORM: gl_extensions.supportsBC7 = true; break; #endif }