ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge of part of #336.

This commit is contained in:
Ben Vanik 2015-07-21 19:43:16 -07:00
parent 2215d4707d
commit 7df2692822
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/gpu/gl4/texture_cache.cc
View File

@ -41,9 +41,9 @@ static const TextureConfig texture_configs[64] = {
{TextureFormat::k_8, GL_R8, GL_RED, GL_UNSIGNED_BYTE}, {TextureFormat::k_8, GL_R8, GL_RED, GL_UNSIGNED_BYTE},
{TextureFormat::k_1_5_5_5, GL_RGB5_A1, GL_RGBA, {TextureFormat::k_1_5_5_5, GL_RGB5_A1, GL_RGBA,
GL_UNSIGNED_SHORT_1_5_5_5_REV}, GL_UNSIGNED_SHORT_1_5_5_5_REV},
{TextureFormat::k_5_6_5, GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5}, {TextureFormat::k_5_6_5, GL_RGB565, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV},
{TextureFormat::k_6_5_5, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, {TextureFormat::k_6_5_5, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM},
{TextureFormat::k_8_8_8_8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE}, {TextureFormat::k_8_8_8_8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV},
{TextureFormat::k_2_10_10_10, GL_RGB10_A2, GL_RGBA, {TextureFormat::k_2_10_10_10, GL_RGB10_A2, GL_RGBA,
GL_UNSIGNED_INT_2_10_10_10_REV}, GL_UNSIGNED_INT_2_10_10_10_REV},
{TextureFormat::k_8_A, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, {TextureFormat::k_8_A, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM},