mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl: Remove GL_R 'format'. There is no GL_R format, it part of the S-T-Q-R enums for texture coordinate space

Browse Source
This commit is contained in:
kd-11 2019-01-22 14:31:03 +03:00 committed by kd-11
parent 5a4bea8c4f
commit 521969bcc3
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rpcs3/Emu/RSX/GL/GLHelpers.h
View File

@ -1383,8 +1383,7 @@ namespace gl
enum class internal_format enum class internal_format
{ {
red = GL_RED, r = GL_RED,
r = GL_R,
rg = GL_RG, rg = GL_RG,
rgb = GL_RGB, rgb = GL_RGB,
rgba = GL_RGBA, rgba = GL_RGBA,

4
rpcs3/Emu/RSX/GL/GLTexture.cpp
View File

@ -100,9 +100,9 @@ namespace gl
case texture::internal_format::compressed_rgba_s3tc_dxt5: case texture::internal_format::compressed_rgba_s3tc_dxt5:
return std::make_tuple(GL_RGBA, GL_UNSIGNED_BYTE, false); return std::make_tuple(GL_RGBA, GL_UNSIGNED_BYTE, false);
case texture::internal_format::r8: 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: 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: case texture::internal_format::r5g6b5:
return std::make_tuple(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, true); return std::make_tuple(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, true);
case texture::internal_format::rg8: case texture::internal_format::rg8: