Merge pull request #482 from Subv/r8
GPU: Implemented the R8 texture format (0x1D)
This commit is contained in:
commit
c8e1383fa9
|
@ -48,6 +48,7 @@ static constexpr std::array<FormatTuple, SurfaceParams::MaxPixelFormat> tex_form
|
||||||
{GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV, false}, // B5G6R5
|
{GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5_REV, false}, // B5G6R5
|
||||||
{GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, false}, // A2B10G10R10
|
{GL_RGB10_A2, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, false}, // A2B10G10R10
|
||||||
{GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, false}, // A1B5G5R5
|
{GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, false}, // A1B5G5R5
|
||||||
|
{GL_R8, GL_RED, GL_UNSIGNED_BYTE, false}, // R8
|
||||||
{GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_RGB, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT1
|
{GL_COMPRESSED_RGB_S3TC_DXT1_EXT, GL_RGB, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT1
|
||||||
{GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT23
|
{GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT23
|
||||||
{GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT45
|
{GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, true}, // DXT45
|
||||||
|
@ -109,8 +110,8 @@ static constexpr std::array<void (*)(u32, u32, u32, u8*, Tegra::GPUVAddr, Tegra:
|
||||||
morton_to_gl_fns = {
|
morton_to_gl_fns = {
|
||||||
MortonCopy<true, PixelFormat::ABGR8>, MortonCopy<true, PixelFormat::B5G6R5>,
|
MortonCopy<true, PixelFormat::ABGR8>, MortonCopy<true, PixelFormat::B5G6R5>,
|
||||||
MortonCopy<true, PixelFormat::A2B10G10R10>, MortonCopy<true, PixelFormat::A1B5G5R5>,
|
MortonCopy<true, PixelFormat::A2B10G10R10>, MortonCopy<true, PixelFormat::A1B5G5R5>,
|
||||||
MortonCopy<true, PixelFormat::DXT1>, MortonCopy<true, PixelFormat::DXT23>,
|
MortonCopy<true, PixelFormat::R8>, MortonCopy<true, PixelFormat::DXT1>,
|
||||||
MortonCopy<true, PixelFormat::DXT45>,
|
MortonCopy<true, PixelFormat::DXT23>, MortonCopy<true, PixelFormat::DXT45>,
|
||||||
};
|
};
|
||||||
|
|
||||||
static constexpr std::array<void (*)(u32, u32, u32, u8*, Tegra::GPUVAddr, Tegra::GPUVAddr,
|
static constexpr std::array<void (*)(u32, u32, u32, u8*, Tegra::GPUVAddr, Tegra::GPUVAddr,
|
||||||
|
@ -121,6 +122,7 @@ static constexpr std::array<void (*)(u32, u32, u32, u8*, Tegra::GPUVAddr, Tegra:
|
||||||
MortonCopy<false, PixelFormat::B5G6R5>,
|
MortonCopy<false, PixelFormat::B5G6R5>,
|
||||||
MortonCopy<false, PixelFormat::A2B10G10R10>,
|
MortonCopy<false, PixelFormat::A2B10G10R10>,
|
||||||
MortonCopy<false, PixelFormat::A1B5G5R5>,
|
MortonCopy<false, PixelFormat::A1B5G5R5>,
|
||||||
|
MortonCopy<false, PixelFormat::R8>,
|
||||||
// TODO(Subv): Swizzling the DXT1/DXT23/DXT45 formats is not yet supported
|
// TODO(Subv): Swizzling the DXT1/DXT23/DXT45 formats is not yet supported
|
||||||
nullptr,
|
nullptr,
|
||||||
nullptr,
|
nullptr,
|
||||||
|
|
|
@ -58,9 +58,10 @@ struct SurfaceParams {
|
||||||
B5G6R5 = 1,
|
B5G6R5 = 1,
|
||||||
A2B10G10R10 = 2,
|
A2B10G10R10 = 2,
|
||||||
A1B5G5R5 = 3,
|
A1B5G5R5 = 3,
|
||||||
DXT1 = 4,
|
R8 = 4,
|
||||||
DXT23 = 5,
|
DXT1 = 5,
|
||||||
DXT45 = 6,
|
DXT23 = 6,
|
||||||
|
DXT45 = 7,
|
||||||
|
|
||||||
Max,
|
Max,
|
||||||
Invalid = 255,
|
Invalid = 255,
|
||||||
|
@ -100,6 +101,7 @@ struct SurfaceParams {
|
||||||
1, // B5G6R5
|
1, // B5G6R5
|
||||||
1, // A2B10G10R10
|
1, // A2B10G10R10
|
||||||
1, // A1B5G5R5
|
1, // A1B5G5R5
|
||||||
|
1, // R8
|
||||||
4, // DXT1
|
4, // DXT1
|
||||||
4, // DXT23
|
4, // DXT23
|
||||||
4, // DXT45
|
4, // DXT45
|
||||||
|
@ -121,6 +123,7 @@ struct SurfaceParams {
|
||||||
16, // B5G6R5
|
16, // B5G6R5
|
||||||
32, // A2B10G10R10
|
32, // A2B10G10R10
|
||||||
16, // A1B5G5R5
|
16, // A1B5G5R5
|
||||||
|
8, // R8
|
||||||
64, // DXT1
|
64, // DXT1
|
||||||
128, // DXT23
|
128, // DXT23
|
||||||
128, // DXT45
|
128, // DXT45
|
||||||
|
@ -167,6 +170,8 @@ struct SurfaceParams {
|
||||||
return PixelFormat::A2B10G10R10;
|
return PixelFormat::A2B10G10R10;
|
||||||
case Tegra::Texture::TextureFormat::A1B5G5R5:
|
case Tegra::Texture::TextureFormat::A1B5G5R5:
|
||||||
return PixelFormat::A1B5G5R5;
|
return PixelFormat::A1B5G5R5;
|
||||||
|
case Tegra::Texture::TextureFormat::R8:
|
||||||
|
return PixelFormat::R8;
|
||||||
case Tegra::Texture::TextureFormat::DXT1:
|
case Tegra::Texture::TextureFormat::DXT1:
|
||||||
return PixelFormat::DXT1;
|
return PixelFormat::DXT1;
|
||||||
case Tegra::Texture::TextureFormat::DXT23:
|
case Tegra::Texture::TextureFormat::DXT23:
|
||||||
|
@ -190,6 +195,8 @@ struct SurfaceParams {
|
||||||
return Tegra::Texture::TextureFormat::A2B10G10R10;
|
return Tegra::Texture::TextureFormat::A2B10G10R10;
|
||||||
case PixelFormat::A1B5G5R5:
|
case PixelFormat::A1B5G5R5:
|
||||||
return Tegra::Texture::TextureFormat::A1B5G5R5;
|
return Tegra::Texture::TextureFormat::A1B5G5R5;
|
||||||
|
case PixelFormat::R8:
|
||||||
|
return Tegra::Texture::TextureFormat::R8;
|
||||||
case PixelFormat::DXT1:
|
case PixelFormat::DXT1:
|
||||||
return Tegra::Texture::TextureFormat::DXT1;
|
return Tegra::Texture::TextureFormat::DXT1;
|
||||||
case PixelFormat::DXT23:
|
case PixelFormat::DXT23:
|
||||||
|
|
|
@ -58,6 +58,8 @@ u32 BytesPerPixel(TextureFormat format) {
|
||||||
case TextureFormat::A1B5G5R5:
|
case TextureFormat::A1B5G5R5:
|
||||||
case TextureFormat::B5G6R5:
|
case TextureFormat::B5G6R5:
|
||||||
return 2;
|
return 2;
|
||||||
|
case TextureFormat::R8:
|
||||||
|
return 1;
|
||||||
default:
|
default:
|
||||||
UNIMPLEMENTED_MSG("Format not implemented");
|
UNIMPLEMENTED_MSG("Format not implemented");
|
||||||
break;
|
break;
|
||||||
|
@ -83,6 +85,7 @@ std::vector<u8> UnswizzleTexture(VAddr address, TextureFormat format, u32 width,
|
||||||
case TextureFormat::A2B10G10R10:
|
case TextureFormat::A2B10G10R10:
|
||||||
case TextureFormat::A1B5G5R5:
|
case TextureFormat::A1B5G5R5:
|
||||||
case TextureFormat::B5G6R5:
|
case TextureFormat::B5G6R5:
|
||||||
|
case TextureFormat::R8:
|
||||||
CopySwizzledData(width, height, bytes_per_pixel, bytes_per_pixel, data,
|
CopySwizzledData(width, height, bytes_per_pixel, bytes_per_pixel, data,
|
||||||
unswizzled_data.data(), true, block_height);
|
unswizzled_data.data(), true, block_height);
|
||||||
break;
|
break;
|
||||||
|
@ -107,6 +110,7 @@ std::vector<u8> DecodeTexture(const std::vector<u8>& texture_data, TextureFormat
|
||||||
case TextureFormat::A2B10G10R10:
|
case TextureFormat::A2B10G10R10:
|
||||||
case TextureFormat::A1B5G5R5:
|
case TextureFormat::A1B5G5R5:
|
||||||
case TextureFormat::B5G6R5:
|
case TextureFormat::B5G6R5:
|
||||||
|
case TextureFormat::R8:
|
||||||
// TODO(Subv): For the time being just forward the same data without any decoding.
|
// TODO(Subv): For the time being just forward the same data without any decoding.
|
||||||
rgba_data = texture_data;
|
rgba_data = texture_data;
|
||||||
break;
|
break;
|
||||||
|
|
Reference in New Issue