From 767f796306d0e15310b92adbbad7127b200ccb01 Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 27 Jun 2015 07:37:38 +0800 Subject: [PATCH 1/2] gl4: more texture formats --- src/xenia/gpu/gl4/texture_cache.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/xenia/gpu/gl4/texture_cache.cc b/src/xenia/gpu/gl4/texture_cache.cc index 25e8a1197..7a8744185 100644 --- a/src/xenia/gpu/gl4/texture_cache.cc +++ b/src/xenia/gpu/gl4/texture_cache.cc @@ -88,10 +88,9 @@ static const TextureConfig texture_configs[64] = { {TextureFormat::k_16_FLOAT, GL_R16F, GL_RED, GL_HALF_FLOAT}, {TextureFormat::k_16_16_FLOAT, GL_RG16F, GL_RG, GL_HALF_FLOAT}, {TextureFormat::k_16_16_16_16_FLOAT, GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT}, - {TextureFormat::k_32, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, - {TextureFormat::k_32_32, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, - {TextureFormat::k_32_32_32_32, GL_INVALID_ENUM, GL_INVALID_ENUM, - GL_INVALID_ENUM}, + {TextureFormat::k_32, GL_R32, GL_RED, GL_UNSIGNED_INT}, + {TextureFormat::k_32_32, GL_RG32, GL_RG, GL_UNSIGNED_INT}, + {TextureFormat::k_32_32_32_32, GL_RGBA32, GL_RGBA, GL_UNSIGNED_INT}, {TextureFormat::k_32_FLOAT, GL_R32F, GL_RED, GL_FLOAT}, {TextureFormat::k_32_32_FLOAT, GL_RG32F, GL_RG, GL_FLOAT}, {TextureFormat::k_32_32_32_32_FLOAT, GL_RGBA32F, GL_RGBA, GL_FLOAT}, @@ -103,14 +102,12 @@ static const TextureConfig texture_configs[64] = { GL_INVALID_ENUM}, {TextureFormat::k_16_16_MPEG, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, - {TextureFormat::k_8_INTERLACED, GL_INVALID_ENUM, GL_INVALID_ENUM, - GL_INVALID_ENUM}, + {TextureFormat::k_8_INTERLACED, GL_R8I, GL_RED, GL_UNSIGNED_BYTE}, {TextureFormat::k_32_AS_8_INTERLACED, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, {TextureFormat::k_32_AS_8_8_INTERLACED, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, - {TextureFormat::k_16_INTERLACED, GL_INVALID_ENUM, GL_INVALID_ENUM, - GL_INVALID_ENUM}, + {TextureFormat::k_16_INTERLACED, GL_R16I, GL_RED, GL_UNSIGNED_SHORT}, {TextureFormat::k_16_MPEG_INTERLACED, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, {TextureFormat::k_16_16_MPEG_INTERLACED, GL_INVALID_ENUM, GL_INVALID_ENUM, From 3a2e7bce973b4b7772b9ffdf57f53fee38779fae Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 27 Jun 2015 08:00:35 +0800 Subject: [PATCH 2/2] Typo fix --- src/xenia/gpu/gl4/texture_cache.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/xenia/gpu/gl4/texture_cache.cc b/src/xenia/gpu/gl4/texture_cache.cc index 7a8744185..0eb025638 100644 --- a/src/xenia/gpu/gl4/texture_cache.cc +++ b/src/xenia/gpu/gl4/texture_cache.cc @@ -88,9 +88,9 @@ static const TextureConfig texture_configs[64] = { {TextureFormat::k_16_FLOAT, GL_R16F, GL_RED, GL_HALF_FLOAT}, {TextureFormat::k_16_16_FLOAT, GL_RG16F, GL_RG, GL_HALF_FLOAT}, {TextureFormat::k_16_16_16_16_FLOAT, GL_RGBA16F, GL_RGBA, GL_HALF_FLOAT}, - {TextureFormat::k_32, GL_R32, GL_RED, GL_UNSIGNED_INT}, - {TextureFormat::k_32_32, GL_RG32, GL_RG, GL_UNSIGNED_INT}, - {TextureFormat::k_32_32_32_32, GL_RGBA32, GL_RGBA, GL_UNSIGNED_INT}, + {TextureFormat::k_32, GL_R32I, GL_RED, GL_UNSIGNED_INT}, + {TextureFormat::k_32_32, GL_RG32I, GL_RG, GL_UNSIGNED_INT}, + {TextureFormat::k_32_32_32_32, GL_RGBA32I, GL_RGBA, GL_UNSIGNED_INT}, {TextureFormat::k_32_FLOAT, GL_R32F, GL_RED, GL_FLOAT}, {TextureFormat::k_32_32_FLOAT, GL_RG32F, GL_RG, GL_FLOAT}, {TextureFormat::k_32_32_32_32_FLOAT, GL_RGBA32F, GL_RGBA, GL_FLOAT}, @@ -129,7 +129,8 @@ static const TextureConfig texture_configs[64] = { {TextureFormat::k_11_11_10_AS_16_16_16_16, GL_R11F_G11F_B10F, GL_INVALID_ENUM, GL_INVALID_ENUM}, {TextureFormat::k_32_32_32_FLOAT, GL_RGB32F, GL_RGB, GL_FLOAT}, - {TextureFormat::k_DXT3A, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM}, + {TextureFormat::k_DXT3A, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, + GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_UNSIGNED_BYTE}, {TextureFormat::k_DXT5A, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_UNSIGNED_BYTE}, {TextureFormat::k_CTX1, GL_INVALID_ENUM, GL_INVALID_ENUM, GL_INVALID_ENUM},