Skip to content

A
angle
Commit f2b47418 by Alexey Knyazev Committed by Commit Bot
Options

Align BPTC format names in angle::FormatID

Use the same naming convention as other similar formats. Bug: angleproject:5731 Change-Id: I187881f4bc4691a0963502ed41f42ab0ebf4171c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2846824Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Alexey Knyazev <lexa.knyazev@gmail.com>
parent ccd984ff
Showing with 133 additions and 127 deletions
scripts/code_generation_hashes/ANGLE_format.json
{ {
"src/libANGLE/renderer/FormatID_autogen.h": "src/libANGLE/renderer/FormatID_autogen.h":
"9ba2d452bf05b9ae21ed86e57490c703", "27b489d26f03514a466c5b3a8302eb4b",
"src/libANGLE/renderer/Format_table_autogen.cpp": "src/libANGLE/renderer/Format_table_autogen.cpp":
"969f821f7241fbc3df16864daeafa68e", "b28fd3a6ed2ff60197dbb40c4b122d31",
"src/libANGLE/renderer/angle_format.py": "src/libANGLE/renderer/angle_format.py":
"35b819b32d3259961da75f5c971baba4", "35b819b32d3259961da75f5c971baba4",
"src/libANGLE/renderer/angle_format_data.json": "src/libANGLE/renderer/angle_format_data.json":
"4b3b5d4beef95c282ba4f20fdc2b20ed", "10e2ee1ed8ee54226edb644de30f512d",
"src/libANGLE/renderer/angle_format_map.json": "src/libANGLE/renderer/angle_format_map.json":
"46b589fc0fc306b2f7c97ee7bb08baee", "5cfbdcad0391a5d70dca1466c5361ee4",
"src/libANGLE/renderer/gen_angle_format_table.py": "src/libANGLE/renderer/gen_angle_format_table.py":
"70bdbceee30506d4b14bf52f2bbd8f2b" "70bdbceee30506d4b14bf52f2bbd8f2b"
} }
\ No newline at end of file
scripts/code_generation_hashes/D3D11_format.json
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
"src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py": "src/libANGLE/renderer/d3d/d3d11/gen_texture_format_table.py":
"bbb56f0a35bb2506524654444c8210d3", "bbb56f0a35bb2506524654444c8210d3",
"src/libANGLE/renderer/d3d/d3d11/texture_format_data.json": "src/libANGLE/renderer/d3d/d3d11/texture_format_data.json":
"b491f92f2adadad269248eb17dee8821", "3666635f9fd4f1a80fb24153271c5f59",
"src/libANGLE/renderer/d3d/d3d11/texture_format_map.json": "src/libANGLE/renderer/d3d/d3d11/texture_format_map.json":
"d45aee3519b8c9a15411617bbb00c77f", "d45aee3519b8c9a15411617bbb00c77f",
"src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp": "src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp":
"184a0dde69048877ccf9893daa786572" "2c667bd412c58424a9b3a25ffb00f01c"
} }
\ No newline at end of file
scripts/code_generation_hashes/DXGI_format.json
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"src/libANGLE/renderer/angle_format.py": "src/libANGLE/renderer/angle_format.py":
"35b819b32d3259961da75f5c971baba4", "35b819b32d3259961da75f5c971baba4",
"src/libANGLE/renderer/angle_format_map.json": "src/libANGLE/renderer/angle_format_map.json":
"46b589fc0fc306b2f7c97ee7bb08baee", "5cfbdcad0391a5d70dca1466c5361ee4",
"src/libANGLE/renderer/dxgi_format_data.json": "src/libANGLE/renderer/dxgi_format_data.json":
"3428e4761ccd05f960adffd6ccbd86c5", "3428e4761ccd05f960adffd6ccbd86c5",
"src/libANGLE/renderer/dxgi_format_map_autogen.cpp": "src/libANGLE/renderer/dxgi_format_map_autogen.cpp":
......
scripts/code_generation_hashes/Metal_default_shaders.json
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"src/libANGLE/renderer/angle_format.py": "src/libANGLE/renderer/angle_format.py":
"35b819b32d3259961da75f5c971baba4", "35b819b32d3259961da75f5c971baba4",
"src/libANGLE/renderer/angle_format_map.json": "src/libANGLE/renderer/angle_format_map.json":
"46b589fc0fc306b2f7c97ee7bb08baee", "5cfbdcad0391a5d70dca1466c5361ee4",
"src/libANGLE/renderer/gen_angle_format_table.py": "src/libANGLE/renderer/gen_angle_format_table.py":
"70bdbceee30506d4b14bf52f2bbd8f2b", "70bdbceee30506d4b14bf52f2bbd8f2b",
"src/libANGLE/renderer/metal/shaders/blit.metal": "src/libANGLE/renderer/metal/shaders/blit.metal":
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"src/libANGLE/renderer/metal/shaders/copy_buffer.metal": "src/libANGLE/renderer/metal/shaders/copy_buffer.metal":
"83d33cc789cb5df7b173b98c50770c0f", "83d33cc789cb5df7b173b98c50770c0f",
"src/libANGLE/renderer/metal/shaders/format_autogen.h": "src/libANGLE/renderer/metal/shaders/format_autogen.h":
"0b8cbcd9b2e94f0688a334813c67f629", "078e03a4b530b6a9ec4740d291beb6e9",
"src/libANGLE/renderer/metal/shaders/gen_indices.metal": "src/libANGLE/renderer/metal/shaders/gen_indices.metal":
"06e2b6f259fe019b46e2a9710eb11bff", "06e2b6f259fe019b46e2a9710eb11bff",
"src/libANGLE/renderer/metal/shaders/gen_mipmap.metal": "src/libANGLE/renderer/metal/shaders/gen_mipmap.metal":
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
"src/libANGLE/renderer/metal/shaders/gen_mtl_internal_shaders.py": "src/libANGLE/renderer/metal/shaders/gen_mtl_internal_shaders.py":
"ba74ebbfa2ceb825f36e84f2985b3d3d", "ba74ebbfa2ceb825f36e84f2985b3d3d",
"src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc": "src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc":
"94260983944013d7b094aaab74f37a17", "12c9d71bde88dd305c2b1088ecd2d1c4",
"src/libANGLE/renderer/metal/shaders/visibility.metal": "src/libANGLE/renderer/metal/shaders/visibility.metal":
"b82aa740cf4b0aed606aacef1024beea" "b82aa740cf4b0aed606aacef1024beea"
} }
\ No newline at end of file
scripts/code_generation_hashes/Metal_format_table.json
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"src/libANGLE/renderer/angle_format.py": "src/libANGLE/renderer/angle_format.py":
"35b819b32d3259961da75f5c971baba4", "35b819b32d3259961da75f5c971baba4",
"src/libANGLE/renderer/angle_format_map.json": "src/libANGLE/renderer/angle_format_map.json":
"46b589fc0fc306b2f7c97ee7bb08baee", "5cfbdcad0391a5d70dca1466c5361ee4",
"src/libANGLE/renderer/metal/gen_mtl_format_table.py": "src/libANGLE/renderer/metal/gen_mtl_format_table.py":
"aabe2ff87c8d03cae69125535089e392", "aabe2ff87c8d03cae69125535089e392",
"src/libANGLE/renderer/metal/mtl_format_map.json": "src/libANGLE/renderer/metal/mtl_format_map.json":
"848c1e2f6d76115e3d0499346b5684d5", "fa859c45367bd80c055793ffb209b4fc",
"src/libANGLE/renderer/metal/mtl_format_table_autogen.mm": "src/libANGLE/renderer/metal/mtl_format_table_autogen.mm":
"6d9b7743cbca2a3b2485c748c289e58c" "f7fec5457e13020368121f594c48a17a"
} }
\ No newline at end of file
scripts/code_generation_hashes/Vulkan_format.json
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
"src/libANGLE/renderer/angle_format.py": "src/libANGLE/renderer/angle_format.py":
"35b819b32d3259961da75f5c971baba4", "35b819b32d3259961da75f5c971baba4",
"src/libANGLE/renderer/angle_format_map.json": "src/libANGLE/renderer/angle_format_map.json":
"46b589fc0fc306b2f7c97ee7bb08baee", "5cfbdcad0391a5d70dca1466c5361ee4",
"src/libANGLE/renderer/vulkan/gen_vk_format_table.py": "src/libANGLE/renderer/vulkan/gen_vk_format_table.py":
"ffeebc0e8ec8db860e472c7cf04cd880", "ffeebc0e8ec8db860e472c7cf04cd880",
"src/libANGLE/renderer/vulkan/vk_format_map.json": "src/libANGLE/renderer/vulkan/vk_format_map.json":
"3b4563c98576280cbe4bcb9af4aafdde", "62dfb5531d601d774ce4729c0daac896",
"src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp": "src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp":
"459f920b945c11152539e9241de46a95" "043dfad0df3e00e759ba8959f4178714"
} }
\ No newline at end of file
scripts/code_generation_hashes/Vulkan_mandatory_format_support_table.json
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
"src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py": "src/libANGLE/renderer/vulkan/gen_vk_mandatory_format_support_table.py":
"3e2b8cd80373275e862bb7c8ba20a745", "3e2b8cd80373275e862bb7c8ba20a745",
"src/libANGLE/renderer/vulkan/vk_format_map.json": "src/libANGLE/renderer/vulkan/vk_format_map.json":
"3b4563c98576280cbe4bcb9af4aafdde", "62dfb5531d601d774ce4729c0daac896",
"src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json": "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_data.json":
"fa2bd54c1bb0ab2cf1d386061a4bc5c5", "fa2bd54c1bb0ab2cf1d386061a4bc5c5",
"src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp": "src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp":
"16d7c971fcdf6050b065d38ece822d0b", "4d9b8f552adb1bf953e77540f021ea0c",
"third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml": "third_party/vulkan-deps/vulkan-headers/src/registry/vk.xml":
"c19528e246351b6be49048e1eb0b8dcb" "c19528e246351b6be49048e1eb0b8dcb"
} }
\ No newline at end of file
src/libANGLE/renderer/FormatID_autogen.h
...@@ -104,10 +104,10 @@ enum class FormatID ...@@ -104,10 +104,10 @@ enum class FormatID
BC4_RED_UNORM_BLOCK, BC4_RED_UNORM_BLOCK,
BC5_RG_SNORM_BLOCK, BC5_RG_SNORM_BLOCK,
BC5_RG_UNORM_BLOCK, BC5_RG_UNORM_BLOCK,
BPTC_RGBA_UNORM_BLOCK, BC6H_RGB_SFLOAT_BLOCK,
BPTC_RGB_SIGNED_FLOAT_BLOCK, BC6H_RGB_UFLOAT_BLOCK,
BPTC_RGB_UNSIGNED_FLOAT_BLOCK, BC7_RGBA_UNORM_BLOCK,
BPTC_SRGB_ALPHA_UNORM_BLOCK, BC7_RGBA_UNORM_SRGB_BLOCK,
EAC_R11G11_SNORM_BLOCK, EAC_R11G11_SNORM_BLOCK,
EAC_R11G11_UNORM_BLOCK, EAC_R11G11_UNORM_BLOCK,
EAC_R11_SNORM_BLOCK, EAC_R11_SNORM_BLOCK,
......
src/libANGLE/renderer/Format_table_autogen.cpp
...@@ -111,10 +111,10 @@ const Format gFormatInfoTable[] = { ...@@ -111,10 +111,10 @@ const Format gFormatInfoTable[] = {
{ FormatID::BC4_RED_UNORM_BLOCK, GL_COMPRESSED_RED_RGTC1_EXT, GL_COMPRESSED_RED_RGTC1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum }, { FormatID::BC4_RED_UNORM_BLOCK, GL_COMPRESSED_RED_RGTC1_EXT, GL_COMPRESSED_RED_RGTC1_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 8, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::BC5_RG_SNORM_BLOCK, GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum }, { FormatID::BC5_RG_SNORM_BLOCK, GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::BC5_RG_UNORM_BLOCK, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum }, { FormatID::BC5_RG_UNORM_BLOCK, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, GL_COMPRESSED_RED_GREEN_RGTC2_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::BPTC_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum }, { FormatID::BC6H_RGB_SFLOAT_BLOCK, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::Float }, { FormatID::BC6H_RGB_UFLOAT_BLOCK, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_FLOAT, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::Float }, { FormatID::BC7_RGBA_UNORM_BLOCK, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, true, false, gl::VertexAttribType::InvalidEnum }, { FormatID::BC7_RGBA_UNORM_SRGB_BLOCK, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 0, 0, 0, 0, 0, 0, 0, 16, std::numeric_limits<GLuint>::max(), true, false, false, true, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::EAC_R11G11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_RG11_EAC, GL_COMPRESSED_SIGNED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0, 0, 16, 0, true, false, false, false, false, gl::VertexAttribType::InvalidEnum }, { FormatID::EAC_R11G11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_RG11_EAC, GL_COMPRESSED_SIGNED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0, 0, 16, 0, true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::EAC_R11G11_UNORM_BLOCK, GL_COMPRESSED_RG11_EAC, GL_COMPRESSED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0, 0, 16, 0, true, false, false, false, false, gl::VertexAttribType::InvalidEnum }, { FormatID::EAC_R11G11_UNORM_BLOCK, GL_COMPRESSED_RG11_EAC, GL_COMPRESSED_RG11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_UNSIGNED_NORMALIZED, 11, 11, 0, 0, 0, 0, 0, 16, 0, true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
{ FormatID::EAC_R11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_R11_EAC, GL_COMPRESSED_SIGNED_R11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 0, 0, 0, 0, 0, 0, 8, 0, true, false, false, false, false, gl::VertexAttribType::InvalidEnum }, { FormatID::EAC_R11_SNORM_BLOCK, GL_COMPRESSED_SIGNED_R11_EAC, GL_COMPRESSED_SIGNED_R11_EAC, nullptr, NoCopyFunctions, nullptr, nullptr, GL_SIGNED_NORMALIZED, 11, 0, 0, 0, 0, 0, 0, 8, 0, true, false, false, false, false, gl::VertexAttribType::InvalidEnum },
...@@ -355,7 +355,7 @@ FormatID Format::InternalFormatToID(GLenum internalFormat) ...@@ -355,7 +355,7 @@ FormatID Format::InternalFormatToID(GLenum internalFormat)
case GL_COMPRESSED_RGBA_ASTC_8x8_KHR: case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
return FormatID::ASTC_8x8_UNORM_BLOCK; return FormatID::ASTC_8x8_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT: case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
return FormatID::BPTC_RGBA_UNORM_BLOCK; return FormatID::BC7_RGBA_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG: case GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG:
return FormatID::PVRTC1_RGBA_2BPP_UNORM_BLOCK; return FormatID::PVRTC1_RGBA_2BPP_UNORM_BLOCK;
case GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG: case GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG:
...@@ -367,9 +367,9 @@ FormatID Format::InternalFormatToID(GLenum internalFormat) ...@@ -367,9 +367,9 @@ FormatID Format::InternalFormatToID(GLenum internalFormat)
case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE: case GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE:
return FormatID::BC3_RGBA_UNORM_BLOCK; return FormatID::BC3_RGBA_UNORM_BLOCK;
case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT: case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
return FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK; return FormatID::BC6H_RGB_SFLOAT_BLOCK;
case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT: case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
return FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK; return FormatID::BC6H_RGB_UFLOAT_BLOCK;
case GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG: case GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG:
return FormatID::PVRTC1_RGB_2BPP_UNORM_BLOCK; return FormatID::PVRTC1_RGB_2BPP_UNORM_BLOCK;
case GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG: case GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG:
...@@ -439,7 +439,7 @@ FormatID Format::InternalFormatToID(GLenum internalFormat) ...@@ -439,7 +439,7 @@ FormatID Format::InternalFormatToID(GLenum internalFormat)
case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2: case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:
return FormatID::ETC2_R8G8B8A1_SRGB_BLOCK; return FormatID::ETC2_R8G8B8A1_SRGB_BLOCK;
case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT: case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
return FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK; return FormatID::BC7_RGBA_UNORM_SRGB_BLOCK;
case GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT: case GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT:
return FormatID::PVRTC1_RGBA_2BPP_UNORM_SRGB_BLOCK; return FormatID::PVRTC1_RGBA_2BPP_UNORM_SRGB_BLOCK;
case GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT: case GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT:
......
src/libANGLE/renderer/angle_format_data.json
...@@ -213,16 +213,16 @@ ...@@ -213,16 +213,16 @@
"BC5_RG_SNORM_BLOCK": { "BC5_RG_SNORM_BLOCK": {
"blockPixelBytes": "16" "blockPixelBytes": "16"
}, },
"BPTC_SRGB_ALPHA_UNORM_BLOCK": { "BC6H_RGB_UFLOAT_BLOCK": {
"blockPixelBytes": "16" "blockPixelBytes": "16"
}, },
"BPTC_RGB_SIGNED_FLOAT_BLOCK": { "BC6H_RGB_SFLOAT_BLOCK": {
"blockPixelBytes": "16" "blockPixelBytes": "16"
}, },
"BPTC_RGB_UNSIGNED_FLOAT_BLOCK": { "BC7_RGBA_UNORM_BLOCK": {
"blockPixelBytes": "16" "blockPixelBytes": "16"
}, },
"BPTC_RGBA_UNORM_BLOCK": { "BC7_RGBA_UNORM_SRGB_BLOCK": {
"blockPixelBytes": "16" "blockPixelBytes": "16"
}, },
"EAC_R11_SNORM_BLOCK": { "EAC_R11_SNORM_BLOCK": {
......
src/libANGLE/renderer/angle_format_map.json
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
[ "GL_COMPRESSED_SIGNED_RED_RGTC1_EXT", "BC4_RED_SNORM_BLOCK" ], [ "GL_COMPRESSED_SIGNED_RED_RGTC1_EXT", "BC4_RED_SNORM_BLOCK" ],
[ "GL_COMPRESSED_RED_GREEN_RGTC2_EXT", "BC5_RG_UNORM_BLOCK" ], [ "GL_COMPRESSED_RED_GREEN_RGTC2_EXT", "BC5_RG_UNORM_BLOCK" ],
[ "GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT", "BC5_RG_SNORM_BLOCK" ], [ "GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT", "BC5_RG_SNORM_BLOCK" ],
[ "GL_COMPRESSED_RGBA_BPTC_UNORM_EXT", "BPTC_RGBA_UNORM_BLOCK" ], [ "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT", "BC6H_RGB_UFLOAT_BLOCK" ],
[ "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT", "BPTC_SRGB_ALPHA_UNORM_BLOCK" ], [ "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT", "BC6H_RGB_SFLOAT_BLOCK" ],
[ "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT", "BPTC_RGB_SIGNED_FLOAT_BLOCK" ], [ "GL_COMPRESSED_RGBA_BPTC_UNORM_EXT", "BC7_RGBA_UNORM_BLOCK" ],
[ "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT", "BPTC_RGB_UNSIGNED_FLOAT_BLOCK" ], [ "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT", "BC7_RGBA_UNORM_SRGB_BLOCK" ],
[ "GL_DEPTH24_STENCIL8", "D24_UNORM_S8_UINT" ], [ "GL_DEPTH24_STENCIL8", "D24_UNORM_S8_UINT" ],
[ "GL_DEPTH32F_STENCIL8", "D32_FLOAT_S8X24_UINT" ], [ "GL_DEPTH32F_STENCIL8", "D32_FLOAT_S8X24_UINT" ],
[ "GL_DEPTH_COMPONENT16", "D16_UNORM" ], [ "GL_DEPTH_COMPONENT16", "D16_UNORM" ],
......
src/libANGLE/renderer/d3d/d3d11/texture_format_data.json
...@@ -208,34 +208,34 @@ ...@@ -208,34 +208,34 @@
"componentType": "snorm", "componentType": "snorm",
"swizzleFormat": "GL_RGBA8_SNORM" "swizzleFormat": "GL_RGBA8_SNORM"
}, },
"BPTC_RGBA_UNORM_BLOCK": { "BC6H_RGB_UFLOAT_BLOCK": {
"texFormat": "DXGI_FORMAT_BC6H_UF16",
"srvFormat": "DXGI_FORMAT_BC6H_UF16",
"channels": "rgb",
"componentType": "float",
"swizzleFormat": "GL_RGBA32F"
},
"BC6H_RGB_SFLOAT_BLOCK": {
"texFormat": "DXGI_FORMAT_BC6H_SF16",
"srvFormat": "DXGI_FORMAT_BC6H_SF16",
"channels": "rgb",
"componentType": "float",
"swizzleFormat": "GL_RGBA32F"
},
"BC7_RGBA_UNORM_BLOCK": {
"texFormat": "DXGI_FORMAT_BC7_UNORM", "texFormat": "DXGI_FORMAT_BC7_UNORM",
"srvFormat": "DXGI_FORMAT_BC7_UNORM", "srvFormat": "DXGI_FORMAT_BC7_UNORM",
"channels": "rgba", "channels": "rgba",
"componentType": "unorm", "componentType": "unorm",
"swizzleFormat": "GL_RGBA8" "swizzleFormat": "GL_RGBA8"
}, },
"BPTC_SRGB_ALPHA_UNORM_BLOCK": { "BC7_RGBA_UNORM_SRGB_BLOCK": {
"texFormat": "DXGI_FORMAT_BC7_UNORM_SRGB", "texFormat": "DXGI_FORMAT_BC7_UNORM_SRGB",
"srvFormat": "DXGI_FORMAT_BC7_UNORM_SRGB", "srvFormat": "DXGI_FORMAT_BC7_UNORM_SRGB",
"channels": "rgba", "channels": "rgba",
"componentType": "unorm", "componentType": "unorm",
"swizzleFormat": "GL_SRGB8_ALPHA8" "swizzleFormat": "GL_SRGB8_ALPHA8"
}, },
"BPTC_RGB_SIGNED_FLOAT_BLOCK": {
"texFormat": "DXGI_FORMAT_BC6H_SF16",
"srvFormat": "DXGI_FORMAT_BC6H_SF16",
"channels": "rgb",
"componentType": "float",
"swizzleFormat": "GL_RGBA32F"
},
"BPTC_RGB_UNSIGNED_FLOAT_BLOCK": {
"texFormat": "DXGI_FORMAT_BC6H_UF16",
"srvFormat": "DXGI_FORMAT_BC6H_UF16",
"channels": "rgb",
"componentType": "float",
"swizzleFormat": "GL_RGBA32F"
},
"D24_UNORM_S8_UINT": { "D24_UNORM_S8_UINT": {
"FL10Plus": { "FL10Plus": {
"texFormat": "DXGI_FORMAT_R24G8_TYPELESS", "texFormat": "DXGI_FORMAT_R24G8_TYPELESS",
......
src/libANGLE/renderer/d3d/d3d11/texture_format_table_autogen.cpp
...@@ -689,7 +689,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev ...@@ -689,7 +689,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT: case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:
{ {
static constexpr Format info(GL_COMPRESSED_RGBA_BPTC_UNORM_EXT, static constexpr Format info(GL_COMPRESSED_RGBA_BPTC_UNORM_EXT,
angle::FormatID::BPTC_RGBA_UNORM_BLOCK, angle::FormatID::BC7_RGBA_UNORM_BLOCK,
DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM,
DXGI_FORMAT_BC7_UNORM, DXGI_FORMAT_BC7_UNORM,
DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN,
...@@ -773,7 +773,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev ...@@ -773,7 +773,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT: case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:
{ {
static constexpr Format info(GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT, static constexpr Format info(GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT,
angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK, angle::FormatID::BC6H_RGB_SFLOAT_BLOCK,
DXGI_FORMAT_BC6H_SF16, DXGI_FORMAT_BC6H_SF16,
DXGI_FORMAT_BC6H_SF16, DXGI_FORMAT_BC6H_SF16,
DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN,
...@@ -787,7 +787,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev ...@@ -787,7 +787,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT: case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:
{ {
static constexpr Format info(GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT, static constexpr Format info(GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT,
angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK, angle::FormatID::BC6H_RGB_UFLOAT_BLOCK,
DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_UF16,
DXGI_FORMAT_BC6H_UF16, DXGI_FORMAT_BC6H_UF16,
DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN,
...@@ -1305,7 +1305,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev ...@@ -1305,7 +1305,7 @@ const Format &Format::Get(GLenum internalFormat, const Renderer11DeviceCaps &dev
case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT: case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:
{ {
static constexpr Format info(GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT, static constexpr Format info(GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT,
angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK, angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK,
DXGI_FORMAT_BC7_UNORM_SRGB, DXGI_FORMAT_BC7_UNORM_SRGB,
DXGI_FORMAT_BC7_UNORM_SRGB, DXGI_FORMAT_BC7_UNORM_SRGB,
DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN,
......
src/libANGLE/renderer/metal/mtl_format_map.json
...@@ -145,10 +145,10 @@ ...@@ -145,10 +145,10 @@
"BC4_RED_SNORM_BLOCK": "MTLPixelFormatBC4_RSnorm", "BC4_RED_SNORM_BLOCK": "MTLPixelFormatBC4_RSnorm",
"BC5_RG_UNORM_BLOCK": "MTLPixelFormatBC5_RGUnorm", "BC5_RG_UNORM_BLOCK": "MTLPixelFormatBC5_RGUnorm",
"BC5_RG_SNORM_BLOCK": "MTLPixelFormatBC5_RGSnorm", "BC5_RG_SNORM_BLOCK": "MTLPixelFormatBC5_RGSnorm",
"BPTC_RGB_UNSIGNED_FLOAT_BLOCK": "MTLPixelFormatBC6H_RGBUfloat", "BC6H_RGB_UFLOAT_BLOCK": "MTLPixelFormatBC6H_RGBUfloat",
"BPTC_RGB_SIGNED_FLOAT_BLOCK": "MTLPixelFormatBC6H_RGBFloat", "BC6H_RGB_SFLOAT_BLOCK": "MTLPixelFormatBC6H_RGBFloat",
"BPTC_RGBA_UNORM_BLOCK": "MTLPixelFormatBC7_RGBAUnorm", "BC7_RGBA_UNORM_BLOCK": "MTLPixelFormatBC7_RGBAUnorm",
"BPTC_SRGB_ALPHA_UNORM_BLOCK": "MTLPixelFormatBC7_RGBAUnorm_sRGB" "BC7_RGBA_UNORM_SRGB_BLOCK": "MTLPixelFormatBC7_RGBAUnorm_sRGB"
}, },
"override": { "override": {
"L8_UNORM": "R8G8B8A8_UNORM", "L8_UNORM": "R8G8B8A8_UNORM",
......
src/libANGLE/renderer/metal/mtl_format_table_autogen.mm
...@@ -149,14 +149,14 @@ angle::FormatID Format::MetalToAngleFormatID(MTLPixelFormat formatMtl) ...@@ -149,14 +149,14 @@ angle::FormatID Format::MetalToAngleFormatID(MTLPixelFormat formatMtl)
return angle::FormatID::BC5_RG_SNORM_BLOCK; return angle::FormatID::BC5_RG_SNORM_BLOCK;
case MTLPixelFormatBC5_RGUnorm: case MTLPixelFormatBC5_RGUnorm:
return angle::FormatID::BC5_RG_UNORM_BLOCK; return angle::FormatID::BC5_RG_UNORM_BLOCK;
case MTLPixelFormatBC7_RGBAUnorm:
return angle::FormatID::BPTC_RGBA_UNORM_BLOCK;
case MTLPixelFormatBC6H_RGBFloat: case MTLPixelFormatBC6H_RGBFloat:
return angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK; return angle::FormatID::BC6H_RGB_SFLOAT_BLOCK;
case MTLPixelFormatBC6H_RGBUfloat: case MTLPixelFormatBC6H_RGBUfloat:
return angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK; return angle::FormatID::BC6H_RGB_UFLOAT_BLOCK;
case MTLPixelFormatBC7_RGBAUnorm:
return angle::FormatID::BC7_RGBA_UNORM_BLOCK;
case MTLPixelFormatBC7_RGBAUnorm_sRGB: case MTLPixelFormatBC7_RGBAUnorm_sRGB:
return angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK; return angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK;
case MTLPixelFormatDepth16Unorm: case MTLPixelFormatDepth16Unorm:
return angle::FormatID::D16_UNORM; return angle::FormatID::D16_UNORM;
case MTLPixelFormatDepth24Unorm_Stencil8: case MTLPixelFormatDepth24Unorm_Stencil8:
...@@ -1021,37 +1021,37 @@ void Format::init(const DisplayMtl *display, angle::FormatID intendedFormatId_) ...@@ -1021,37 +1021,37 @@ void Format::init(const DisplayMtl *display, angle::FormatID intendedFormatId_)
this->swizzled = false; this->swizzled = false;
break; break;
case angle::FormatID::BPTC_RGBA_UNORM_BLOCK: case angle::FormatID::BC6H_RGB_SFLOAT_BLOCK:
this->metalFormat = MTLPixelFormatBC7_RGBAUnorm; this->metalFormat = MTLPixelFormatBC6H_RGBFloat;
this->actualFormatId = angle::FormatID::BPTC_RGBA_UNORM_BLOCK; this->actualFormatId = angle::FormatID::BC6H_RGB_SFLOAT_BLOCK;
this->initFunction = nullptr; this->initFunction = nullptr;
this->swizzled = false; this->swizzled = false;
break; break;
case angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK: case angle::FormatID::BC6H_RGB_UFLOAT_BLOCK:
this->metalFormat = MTLPixelFormatBC6H_RGBFloat; this->metalFormat = MTLPixelFormatBC6H_RGBUfloat;
this->actualFormatId = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK; this->actualFormatId = angle::FormatID::BC6H_RGB_UFLOAT_BLOCK;
this->initFunction = nullptr; this->initFunction = nullptr;
this->swizzled = false; this->swizzled = false;
break; break;
case angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK: case angle::FormatID::BC7_RGBA_UNORM_BLOCK:
this->metalFormat = MTLPixelFormatBC6H_RGBUfloat; this->metalFormat = MTLPixelFormatBC7_RGBAUnorm;
this->actualFormatId = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK; this->actualFormatId = angle::FormatID::BC7_RGBA_UNORM_BLOCK;
this->initFunction = nullptr; this->initFunction = nullptr;
this->swizzled = false; this->swizzled = false;
break; break;
case angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK: case angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK:
this->metalFormat = MTLPixelFormatBC7_RGBAUnorm_sRGB; this->metalFormat = MTLPixelFormatBC7_RGBAUnorm_sRGB;
this->actualFormatId = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK; this->actualFormatId = angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK;
this->initFunction = nullptr; this->initFunction = nullptr;
this->swizzled = false; this->swizzled = false;
......
src/libANGLE/renderer/metal/shaders/format_autogen.h
...@@ -104,10 +104,10 @@ enum ...@@ -104,10 +104,10 @@ enum
BC4_RED_UNORM_BLOCK, BC4_RED_UNORM_BLOCK,
BC5_RG_SNORM_BLOCK, BC5_RG_SNORM_BLOCK,
BC5_RG_UNORM_BLOCK, BC5_RG_UNORM_BLOCK,
BPTC_RGBA_UNORM_BLOCK, BC6H_RGB_SFLOAT_BLOCK,
BPTC_RGB_SIGNED_FLOAT_BLOCK, BC6H_RGB_UFLOAT_BLOCK,
BPTC_RGB_UNSIGNED_FLOAT_BLOCK, BC7_RGBA_UNORM_BLOCK,
BPTC_SRGB_ALPHA_UNORM_BLOCK, BC7_RGBA_UNORM_SRGB_BLOCK,
EAC_R11G11_SNORM_BLOCK, EAC_R11G11_SNORM_BLOCK,
EAC_R11G11_UNORM_BLOCK, EAC_R11G11_UNORM_BLOCK,
EAC_R11_SNORM_BLOCK, EAC_R11_SNORM_BLOCK,
......
src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc
...@@ -14,7 +14,7 @@ static char gDefaultMetallibSrc[] = R"( ...@@ -14,7 +14,7 @@ static char gDefaultMetallibSrc[] = R"(
# 1 "temp_master_source.metal" # 1 "temp_master_source.metal"
# 1 "<built-in>" 1 # 1 "<built-in>" 1
# 1 "<built-in>" 3 # 1 "<built-in>" 3
# 384 "<built-in>" 3 # 369 "<built-in>" 3
# 1 "<command line>" 1 # 1 "<command line>" 1
# 1 "<built-in>" 2 # 1 "<built-in>" 2
# 1 "temp_master_source.metal" 2 # 1 "temp_master_source.metal" 2
...@@ -1222,10 +1222,10 @@ enum ...@@ -1222,10 +1222,10 @@ enum
BC4_RED_UNORM_BLOCK, BC4_RED_UNORM_BLOCK,
BC5_RG_SNORM_BLOCK, BC5_RG_SNORM_BLOCK,
BC5_RG_UNORM_BLOCK, BC5_RG_UNORM_BLOCK,
BPTC_RGBA_UNORM_BLOCK, BC6H_RGB_SFLOAT_BLOCK,
BPTC_RGB_SIGNED_FLOAT_BLOCK, BC6H_RGB_UFLOAT_BLOCK,
BPTC_RGB_UNSIGNED_FLOAT_BLOCK, BC7_RGBA_UNORM_BLOCK,
BPTC_SRGB_ALPHA_UNORM_BLOCK, BC7_RGBA_UNORM_SRGB_BLOCK,
EAC_R11G11_SNORM_BLOCK, EAC_R11G11_SNORM_BLOCK,
EAC_R11G11_UNORM_BLOCK, EAC_R11G11_UNORM_BLOCK,
EAC_R11_SNORM_BLOCK, EAC_R11_SNORM_BLOCK,
......
src/libANGLE/renderer/renderer_utils.cpp
...@@ -1293,8 +1293,8 @@ angle::FormatID ConvertToSRGB(angle::FormatID formatID) ...@@ -1293,8 +1293,8 @@ angle::FormatID ConvertToSRGB(angle::FormatID formatID)
return angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK; return angle::FormatID::BC2_RGBA_UNORM_SRGB_BLOCK;
case angle::FormatID::BC3_RGBA_UNORM_BLOCK: case angle::FormatID::BC3_RGBA_UNORM_BLOCK:
return angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK; return angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK;
case angle::FormatID::BPTC_RGBA_UNORM_BLOCK: case angle::FormatID::BC7_RGBA_UNORM_BLOCK:
return angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK; return angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK;
case angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK: case angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK:
return angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK; return angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK;
case angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK: case angle::FormatID::ETC2_R8G8B8A1_UNORM_BLOCK:
...@@ -1354,8 +1354,8 @@ angle::FormatID ConvertToLinear(angle::FormatID formatID) ...@@ -1354,8 +1354,8 @@ angle::FormatID ConvertToLinear(angle::FormatID formatID)
return angle::FormatID::BC2_RGBA_UNORM_BLOCK; return angle::FormatID::BC2_RGBA_UNORM_BLOCK;
case angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK: case angle::FormatID::BC3_RGBA_UNORM_SRGB_BLOCK:
return angle::FormatID::BC3_RGBA_UNORM_BLOCK; return angle::FormatID::BC3_RGBA_UNORM_BLOCK;
case angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK: case angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK:
return angle::FormatID::BPTC_RGBA_UNORM_BLOCK; return angle::FormatID::BC7_RGBA_UNORM_BLOCK;
case angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK: case angle::FormatID::ETC2_R8G8B8_SRGB_BLOCK:
return angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK; return angle::FormatID::ETC2_R8G8B8_UNORM_BLOCK;
case angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK: case angle::FormatID::ETC2_R8G8B8A1_SRGB_BLOCK:
......
src/libANGLE/renderer/vulkan/vk_format_map.json
...@@ -123,10 +123,10 @@ ...@@ -123,10 +123,10 @@
"BC4_RED_SNORM_BLOCK": "VK_FORMAT_BC4_SNORM_BLOCK", "BC4_RED_SNORM_BLOCK": "VK_FORMAT_BC4_SNORM_BLOCK",
"BC5_RG_UNORM_BLOCK": "VK_FORMAT_BC5_UNORM_BLOCK", "BC5_RG_UNORM_BLOCK": "VK_FORMAT_BC5_UNORM_BLOCK",
"BC5_RG_SNORM_BLOCK": "VK_FORMAT_BC5_SNORM_BLOCK", "BC5_RG_SNORM_BLOCK": "VK_FORMAT_BC5_SNORM_BLOCK",
"BPTC_RGB_UNSIGNED_FLOAT_BLOCK": "VK_FORMAT_BC6H_UFLOAT_BLOCK", "BC6H_RGB_UFLOAT_BLOCK": "VK_FORMAT_BC6H_UFLOAT_BLOCK",
"BPTC_RGB_SIGNED_FLOAT_BLOCK": "VK_FORMAT_BC6H_SFLOAT_BLOCK", "BC6H_RGB_SFLOAT_BLOCK": "VK_FORMAT_BC6H_SFLOAT_BLOCK",
"BPTC_RGBA_UNORM_BLOCK": "VK_FORMAT_BC7_UNORM_BLOCK", "BC7_RGBA_UNORM_BLOCK": "VK_FORMAT_BC7_UNORM_BLOCK",
"BPTC_SRGB_ALPHA_UNORM_BLOCK": "VK_FORMAT_BC7_SRGB_BLOCK", "BC7_RGBA_UNORM_SRGB_BLOCK": "VK_FORMAT_BC7_SRGB_BLOCK",
"ETC2_R8G8B8_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK", "ETC2_R8G8B8_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK",
"ETC2_R8G8B8_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK", "ETC2_R8G8B8_SRGB_BLOCK": "VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK",
"ETC2_R8G8B8A1_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK", "ETC2_R8G8B8A1_UNORM_BLOCK": "VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK",
......
src/libANGLE/renderer/vulkan/vk_format_table_autogen.cpp
...@@ -674,41 +674,41 @@ void Format::initialize(RendererVk *renderer, const angle::Format &angleFormat) ...@@ -674,41 +674,41 @@ void Format::initialize(RendererVk *renderer, const angle::Format &angleFormat)
vertexLoadRequiresConversion = false; vertexLoadRequiresConversion = false;
break; break;
case angle::FormatID::BPTC_RGBA_UNORM_BLOCK: case angle::FormatID::BC6H_RGB_SFLOAT_BLOCK:
intendedGLFormat = GL_COMPRESSED_RGBA_BPTC_UNORM_EXT; intendedGLFormat = GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT;
actualImageFormatID = angle::FormatID::BPTC_RGBA_UNORM_BLOCK; actualImageFormatID = angle::FormatID::BC6H_RGB_SFLOAT_BLOCK;
imageInitializerFunction = nullptr; imageInitializerFunction = nullptr;
actualBufferFormatID = angle::FormatID::BPTC_RGBA_UNORM_BLOCK; actualBufferFormatID = angle::FormatID::BC6H_RGB_SFLOAT_BLOCK;
vkBufferFormatIsPacked = false; vkBufferFormatIsPacked = false;
vertexLoadFunction = nullptr; vertexLoadFunction = nullptr;
vertexLoadRequiresConversion = false; vertexLoadRequiresConversion = false;
break; break;
case angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK: case angle::FormatID::BC6H_RGB_UFLOAT_BLOCK:
intendedGLFormat = GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT; intendedGLFormat = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT;
actualImageFormatID = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK; actualImageFormatID = angle::FormatID::BC6H_RGB_UFLOAT_BLOCK;
imageInitializerFunction = nullptr; imageInitializerFunction = nullptr;
actualBufferFormatID = angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK; actualBufferFormatID = angle::FormatID::BC6H_RGB_UFLOAT_BLOCK;
vkBufferFormatIsPacked = false; vkBufferFormatIsPacked = false;
vertexLoadFunction = nullptr; vertexLoadFunction = nullptr;
vertexLoadRequiresConversion = false; vertexLoadRequiresConversion = false;
break; break;
case angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK: case angle::FormatID::BC7_RGBA_UNORM_BLOCK:
intendedGLFormat = GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT; intendedGLFormat = GL_COMPRESSED_RGBA_BPTC_UNORM_EXT;
actualImageFormatID = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK; actualImageFormatID = angle::FormatID::BC7_RGBA_UNORM_BLOCK;
imageInitializerFunction = nullptr; imageInitializerFunction = nullptr;
actualBufferFormatID = angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK; actualBufferFormatID = angle::FormatID::BC7_RGBA_UNORM_BLOCK;
vkBufferFormatIsPacked = false; vkBufferFormatIsPacked = false;
vertexLoadFunction = nullptr; vertexLoadFunction = nullptr;
vertexLoadRequiresConversion = false; vertexLoadRequiresConversion = false;
break; break;
case angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK: case angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK:
intendedGLFormat = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT; intendedGLFormat = GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT;
actualImageFormatID = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK; actualImageFormatID = angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK;
imageInitializerFunction = nullptr; imageInitializerFunction = nullptr;
actualBufferFormatID = angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK; actualBufferFormatID = angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK;
vkBufferFormatIsPacked = false; vkBufferFormatIsPacked = false;
vertexLoadFunction = nullptr; vertexLoadFunction = nullptr;
vertexLoadRequiresConversion = false; vertexLoadRequiresConversion = false;
...@@ -2419,10 +2419,10 @@ VkFormat GetVkFormatFromFormatID(angle::FormatID formatID) ...@@ -2419,10 +2419,10 @@ VkFormat GetVkFormatFromFormatID(angle::FormatID formatID)
{angle::FormatID::BC4_RED_UNORM_BLOCK, VK_FORMAT_BC4_UNORM_BLOCK}, {angle::FormatID::BC4_RED_UNORM_BLOCK, VK_FORMAT_BC4_UNORM_BLOCK},
{angle::FormatID::BC5_RG_SNORM_BLOCK, VK_FORMAT_BC5_SNORM_BLOCK}, {angle::FormatID::BC5_RG_SNORM_BLOCK, VK_FORMAT_BC5_SNORM_BLOCK},
{angle::FormatID::BC5_RG_UNORM_BLOCK, VK_FORMAT_BC5_UNORM_BLOCK}, {angle::FormatID::BC5_RG_UNORM_BLOCK, VK_FORMAT_BC5_UNORM_BLOCK},
{angle::FormatID::BPTC_RGBA_UNORM_BLOCK, VK_FORMAT_BC7_UNORM_BLOCK}, {angle::FormatID::BC6H_RGB_SFLOAT_BLOCK, VK_FORMAT_BC6H_SFLOAT_BLOCK},
{angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK, VK_FORMAT_BC6H_SFLOAT_BLOCK}, {angle::FormatID::BC6H_RGB_UFLOAT_BLOCK, VK_FORMAT_BC6H_UFLOAT_BLOCK},
{angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK, VK_FORMAT_BC6H_UFLOAT_BLOCK}, {angle::FormatID::BC7_RGBA_UNORM_BLOCK, VK_FORMAT_BC7_UNORM_BLOCK},
{angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK, VK_FORMAT_BC7_SRGB_BLOCK}, {angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK, VK_FORMAT_BC7_SRGB_BLOCK},
{angle::FormatID::D16_UNORM, VK_FORMAT_D16_UNORM}, {angle::FormatID::D16_UNORM, VK_FORMAT_D16_UNORM},
{angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT}, {angle::FormatID::D24_UNORM_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT},
{angle::FormatID::D24_UNORM_X8_UINT, VK_FORMAT_X8_D24_UNORM_PACK32}, {angle::FormatID::D24_UNORM_X8_UINT, VK_FORMAT_X8_D24_UNORM_PACK32},
...@@ -2621,14 +2621,14 @@ angle::FormatID GetFormatIDFromVkFormat(VkFormat vkFormat) ...@@ -2621,14 +2621,14 @@ angle::FormatID GetFormatIDFromVkFormat(VkFormat vkFormat)
return angle::FormatID::BC5_RG_SNORM_BLOCK; return angle::FormatID::BC5_RG_SNORM_BLOCK;
case VK_FORMAT_BC5_UNORM_BLOCK: case VK_FORMAT_BC5_UNORM_BLOCK:
return angle::FormatID::BC5_RG_UNORM_BLOCK; return angle::FormatID::BC5_RG_UNORM_BLOCK;
case VK_FORMAT_BC7_UNORM_BLOCK:
return angle::FormatID::BPTC_RGBA_UNORM_BLOCK;
case VK_FORMAT_BC6H_SFLOAT_BLOCK: case VK_FORMAT_BC6H_SFLOAT_BLOCK:
return angle::FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK; return angle::FormatID::BC6H_RGB_SFLOAT_BLOCK;
case VK_FORMAT_BC6H_UFLOAT_BLOCK: case VK_FORMAT_BC6H_UFLOAT_BLOCK:
return angle::FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK; return angle::FormatID::BC6H_RGB_UFLOAT_BLOCK;
case VK_FORMAT_BC7_UNORM_BLOCK:
return angle::FormatID::BC7_RGBA_UNORM_BLOCK;
case VK_FORMAT_BC7_SRGB_BLOCK: case VK_FORMAT_BC7_SRGB_BLOCK:
return angle::FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK; return angle::FormatID::BC7_RGBA_UNORM_SRGB_BLOCK;
case VK_FORMAT_D16_UNORM: case VK_FORMAT_D16_UNORM:
return angle::FormatID::D16_UNORM; return angle::FormatID::D16_UNORM;
case VK_FORMAT_D24_UNORM_S8_UINT: case VK_FORMAT_D24_UNORM_S8_UINT:
......
src/libANGLE/renderer/vulkan/vk_mandatory_format_support_table_autogen.cpp
...@@ -76,6 +76,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -76,6 +76,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::ASTC_12x10_UNORM_BLOCK, {0, 0, 0}}, {FormatID::ASTC_12x10_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R8G8B8_SSCALED, {0, 0, 0}}, {FormatID::R8G8B8_SSCALED, {0, 0, 0}},
{FormatID::R32G32B32_UINT, {0, 0, VERTEX_BUFFER}}, {FormatID::R32G32B32_UINT, {0, 0, VERTEX_BUFFER}},
{FormatID::BC6H_RGB_SFLOAT_BLOCK, {0, 0, 0}},
{FormatID::R16_SINT, {FormatID::R16_SINT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE,
UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
...@@ -84,7 +85,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -84,7 +85,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::ASTC_8x8_SRGB_BLOCK, {0, 0, 0}}, {FormatID::ASTC_8x8_SRGB_BLOCK, {0, 0, 0}},
{FormatID::R8_USCALED, {0, 0, 0}}, {FormatID::R8_USCALED, {0, 0, 0}},
{FormatID::R8G8B8_UNORM_SRGB, {0, 0, 0}}, {FormatID::R8G8B8_UNORM_SRGB, {0, 0, 0}},
{FormatID::BPTC_RGB_UNSIGNED_FLOAT_BLOCK, {0, 0, 0}},
{FormatID::B5G5R5A1_UNORM, {0, 0, 0}}, {FormatID::B5G5R5A1_UNORM, {0, 0, 0}},
{FormatID::R16G16_SSCALED, {0, 0, 0}}, {FormatID::R16G16_SSCALED, {0, 0, 0}},
{FormatID::B8G8R8A8_UNORM_SRGB, {FormatID::B8G8R8A8_UNORM_SRGB,
...@@ -136,7 +136,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -136,7 +136,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::EAC_R11_SNORM_BLOCK, {0, 0, 0}}, {FormatID::EAC_R11_SNORM_BLOCK, {0, 0, 0}},
{FormatID::ASTC_8x6_SRGB_BLOCK, {0, 0, 0}}, {FormatID::ASTC_8x6_SRGB_BLOCK, {0, 0, 0}},
{FormatID::R8G8B8A8_USCALED, {0, 0, 0}}, {FormatID::R8G8B8A8_USCALED, {0, 0, 0}},
{FormatID::ASTC_6x5_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R8G8B8A8_UINT, {FormatID::R8G8B8A8_UINT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE,
STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
...@@ -180,7 +179,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -180,7 +179,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::R16G16B16A16_SINT, {FormatID::R16G16B16A16_SINT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE,
STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
{FormatID::BPTC_RGBA_UNORM_BLOCK, {0, 0, 0}},
{FormatID::A1R5G5B5_UNORM, {FormatID::A1R5G5B5_UNORM,
{0, {0,
BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | COLOR_ATTACHMENT_BLEND | SAMPLED_IMAGE | BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | COLOR_ATTACHMENT_BLEND | SAMPLED_IMAGE |
...@@ -193,6 +191,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -193,6 +191,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::R32G32_SINT, {FormatID::R32G32_SINT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE,
STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
{FormatID::BC6H_RGB_UFLOAT_BLOCK, {0, 0, 0}},
{FormatID::R32G32B32_FLOAT, {0, 0, VERTEX_BUFFER}}, {FormatID::R32G32B32_FLOAT, {0, 0, VERTEX_BUFFER}},
{FormatID::R8_UINT, {FormatID::R8_UINT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE,
...@@ -201,7 +200,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -201,7 +200,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::BC1_RGB_UNORM_BLOCK, {0, 0, 0}}, {FormatID::BC1_RGB_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R4G4B4A4_UNORM, {0, 0, 0}}, {FormatID::R4G4B4A4_UNORM, {0, 0, 0}},
{FormatID::BC1_RGB_UNORM_SRGB_BLOCK, {0, 0, 0}}, {FormatID::BC1_RGB_UNORM_SRGB_BLOCK, {0, 0, 0}},
{FormatID::BPTC_RGB_SIGNED_FLOAT_BLOCK, {0, 0, 0}}, {FormatID::ASTC_8x8_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R10G10B10A2_UINT, {FormatID::R10G10B10A2_UINT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE, UNIFORM_TEXEL_BUFFER}}, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE, UNIFORM_TEXEL_BUFFER}},
{FormatID::ASTC_6x5_SRGB_BLOCK, {0, 0, 0}}, {FormatID::ASTC_6x5_SRGB_BLOCK, {0, 0, 0}},
...@@ -217,7 +216,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -217,7 +216,6 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::ASTC_12x12_SRGB_BLOCK, {0, 0, 0}}, {FormatID::ASTC_12x12_SRGB_BLOCK, {0, 0, 0}},
{FormatID::ASTC_5x5_UNORM_BLOCK, {0, 0, 0}}, {FormatID::ASTC_5x5_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R8G8B8_SINT, {0, 0, 0}}, {FormatID::R8G8B8_SINT, {0, 0, 0}},
{FormatID::ASTC_8x8_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R32_SINT, {FormatID::R32_SINT,
{0, {0,
BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE | STORAGE_IMAGE_ATOMIC, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE | STORAGE_IMAGE_ATOMIC,
...@@ -234,6 +232,8 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -234,6 +232,8 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | COLOR_ATTACHMENT_BLEND | SAMPLED_IMAGE | BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | COLOR_ATTACHMENT_BLEND | SAMPLED_IMAGE |
SAMPLED_IMAGE_FILTER_LINEAR, SAMPLED_IMAGE_FILTER_LINEAR,
UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
{FormatID::BC7_RGBA_UNORM_SRGB_BLOCK, {0, 0, 0}},
{FormatID::G8_B8_R8_3PLANE_420_UNORM, {0, 0, 0}},
{FormatID::R32G32_FLOAT, {FormatID::R32G32_FLOAT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE,
STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
...@@ -275,8 +275,8 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -275,8 +275,8 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
{FormatID::R5G5B5A1_UNORM, {0, 0, 0}}, {FormatID::R5G5B5A1_UNORM, {0, 0, 0}},
{FormatID::R8G8B8_UINT, {0, 0, 0}}, {FormatID::R8G8B8_UINT, {0, 0, 0}},
{FormatID::G8_B8_R8_3PLANE_420_UNORM, {0, 0, 0}}, {FormatID::BC7_RGBA_UNORM_BLOCK, {0, 0, 0}},
{FormatID::ETC2_R8G8B8_UNORM_BLOCK, {0, 0, 0}}, {FormatID::ASTC_6x5_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R32_UINT, {FormatID::R32_UINT,
{0, {0,
BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE | STORAGE_IMAGE_ATOMIC, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE | STORAGE_IMAGE_ATOMIC,
...@@ -286,7 +286,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = { ...@@ -286,7 +286,7 @@ constexpr FormatMap<VkFormatProperties> kFormatProperties = {
{FormatID::R32G32B32A32_UINT, {FormatID::R32G32B32A32_UINT,
{0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE, {0, BLIT_DST | BLIT_SRC | COLOR_ATTACHMENT | SAMPLED_IMAGE | STORAGE_IMAGE,
STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}}, STORAGE_TEXEL_BUFFER | UNIFORM_TEXEL_BUFFER | VERTEX_BUFFER}},
{FormatID::BPTC_SRGB_ALPHA_UNORM_BLOCK, {0, 0, 0}}, {FormatID::ETC2_R8G8B8_UNORM_BLOCK, {0, 0, 0}},
{FormatID::R16G16_USCALED, {0, 0, 0}}}; {FormatID::R16G16_USCALED, {0, 0, 0}}};
} // anonymous namespace } // anonymous namespace
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment