From 521969bcc3f42f37347cd99b5fe298af0525ccdb Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 22 Jan 2019 14:31:03 +0300 Subject: [PATCH] gl: Remove GL_R 'format'. There is no GL_R format, it part of the S-T-Q-R enums for texture coordinate space --- rpcs3/Emu/RSX/GL/GLHelpers.h | 3 +-- rpcs3/Emu/RSX/GL/GLTexture.cpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h index 6a1ee8012d..48b848deb8 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.h +++ b/rpcs3/Emu/RSX/GL/GLHelpers.h @@ -1383,8 +1383,7 @@ namespace gl enum class internal_format { - red = GL_RED, - r = GL_R, + r = GL_RED, rg = GL_RG, rgb = GL_RGB, rgba = GL_RGBA, diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp index 3336b11755..f87eb1c6b8 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.cpp +++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp @@ -100,9 +100,9 @@ namespace gl case texture::internal_format::compressed_rgba_s3tc_dxt5: return std::make_tuple(GL_RGBA, GL_UNSIGNED_BYTE, false); case texture::internal_format::r8: - return std::make_tuple(GL_R, GL_UNSIGNED_BYTE, false); + return std::make_tuple(GL_RED, GL_UNSIGNED_BYTE, false); case texture::internal_format::r32f: - return std::make_tuple(GL_R, GL_FLOAT, true); + return std::make_tuple(GL_RED, GL_FLOAT, true); case texture::internal_format::r5g6b5: return std::make_tuple(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, true); case texture::internal_format::rg8: