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 · Jan 22, 2019 · 6453d70 · 6453d70
1 parent ea3b62f
commit 6453d70
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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: