backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[dxvk] Added format flag to mark SRGB color formats

Browse Source
This commit is contained in:
Philip Rebohle 2018-06-06 23:09:39 +02:00
parent 518c260ad6
commit 79d3b203ef
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/dxvk/dxvk_format.cpp
View File

@ -51,7 +51,8 @@ namespace dxvk {
DxvkFormatFlag::SampledInteger }, DxvkFormatFlag::SampledInteger },
// VK_FORMAT_R8_SRGB // VK_FORMAT_R8_SRGB
{ 1, VK_IMAGE_ASPECT_COLOR_BIT }, { 1, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::ColorSpaceSrgb },
// VK_FORMAT_R8G8_UNORM // VK_FORMAT_R8G8_UNORM
{ 2, VK_IMAGE_ASPECT_COLOR_BIT }, { 2, VK_IMAGE_ASPECT_COLOR_BIT },
@ -74,7 +75,8 @@ namespace dxvk {
DxvkFormatFlag::SampledInteger }, DxvkFormatFlag::SampledInteger },
// VK_FORMAT_R8G8_SRGB // VK_FORMAT_R8G8_SRGB
{ 2, VK_IMAGE_ASPECT_COLOR_BIT }, { 2, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::ColorSpaceSrgb },
// VK_FORMAT_R8G8B8_UNORM // VK_FORMAT_R8G8B8_UNORM
{ 3, VK_IMAGE_ASPECT_COLOR_BIT }, { 3, VK_IMAGE_ASPECT_COLOR_BIT },
@ -97,7 +99,8 @@ namespace dxvk {
DxvkFormatFlag::SampledInteger }, DxvkFormatFlag::SampledInteger },
// VK_FORMAT_R8G8B8_SRGB // VK_FORMAT_R8G8B8_SRGB
{ 3, VK_IMAGE_ASPECT_COLOR_BIT }, { 3, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::ColorSpaceSrgb },
// VK_FORMAT_B8G8R8_UNORM // VK_FORMAT_B8G8R8_UNORM
{ 3, VK_IMAGE_ASPECT_COLOR_BIT }, { 3, VK_IMAGE_ASPECT_COLOR_BIT },
@ -120,7 +123,8 @@ namespace dxvk {
DxvkFormatFlag::SampledInteger }, DxvkFormatFlag::SampledInteger },
// VK_FORMAT_B8G8R8_SRGB // VK_FORMAT_B8G8R8_SRGB
{ 3, VK_IMAGE_ASPECT_COLOR_BIT }, { 3, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::ColorSpaceSrgb },
// VK_FORMAT_R8G8B8A8_UNORM // VK_FORMAT_R8G8B8A8_UNORM
{ 4, VK_IMAGE_ASPECT_COLOR_BIT }, { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@ -143,7 +147,8 @@ namespace dxvk {
DxvkFormatFlag::SampledInteger }, DxvkFormatFlag::SampledInteger },
// VK_FORMAT_R8G8B8A8_SRGB // VK_FORMAT_R8G8B8A8_SRGB
{ 4, VK_IMAGE_ASPECT_COLOR_BIT }, { 4, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::ColorSpaceSrgb },
// VK_FORMAT_B8G8R8A8_UNORM // VK_FORMAT_B8G8R8A8_UNORM
{ 4, VK_IMAGE_ASPECT_COLOR_BIT }, { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@ -166,7 +171,8 @@ namespace dxvk {
DxvkFormatFlag::SampledInteger }, DxvkFormatFlag::SampledInteger },
// VK_FORMAT_B8G8R8A8_SRGB // VK_FORMAT_B8G8R8A8_SRGB
{ 4, VK_IMAGE_ASPECT_COLOR_BIT }, { 4, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::ColorSpaceSrgb },
// VK_FORMAT_A8B8G8R8_UNORM_PACK32 // VK_FORMAT_A8B8G8R8_UNORM_PACK32
{ 4, VK_IMAGE_ASPECT_COLOR_BIT }, { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@ -189,7 +195,8 @@ namespace dxvk {
DxvkFormatFlag::SampledInteger }, DxvkFormatFlag::SampledInteger },
// VK_FORMAT_A8B8G8R8_SRGB_PACK32 // VK_FORMAT_A8B8G8R8_SRGB_PACK32
{ 4, VK_IMAGE_ASPECT_COLOR_BIT }, { 4, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::ColorSpaceSrgb },
// VK_FORMAT_A2R10G10B10_UNORM_PACK32 // VK_FORMAT_A2R10G10B10_UNORM_PACK32
{ 4, VK_IMAGE_ASPECT_COLOR_BIT }, { 4, VK_IMAGE_ASPECT_COLOR_BIT },
@ -445,7 +452,9 @@ namespace dxvk {
// VK_FORMAT_BC1_RGB_SRGB_BLOCK // VK_FORMAT_BC1_RGB_SRGB_BLOCK
{ 8, VK_IMAGE_ASPECT_COLOR_BIT, { 8, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::BlockCompressed, DxvkFormatFlags(
DxvkFormatFlag::BlockCompressed,
DxvkFormatFlag::ColorSpaceSrgb),
VkExtent3D { 4, 4, 1 } }, VkExtent3D { 4, 4, 1 } },
// VK_FORMAT_BC1_RGBA_UNORM_BLOCK // VK_FORMAT_BC1_RGBA_UNORM_BLOCK
@ -455,7 +464,9 @@ namespace dxvk {
// VK_FORMAT_BC1_RGBA_SRGB_BLOCK // VK_FORMAT_BC1_RGBA_SRGB_BLOCK
{ 8, VK_IMAGE_ASPECT_COLOR_BIT, { 8, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::BlockCompressed, DxvkFormatFlags(
DxvkFormatFlag::BlockCompressed,
DxvkFormatFlag::ColorSpaceSrgb),
VkExtent3D { 4, 4, 1 } }, VkExtent3D { 4, 4, 1 } },
// VK_FORMAT_BC2_UNORM_BLOCK // VK_FORMAT_BC2_UNORM_BLOCK
@ -465,7 +476,9 @@ namespace dxvk {
// VK_FORMAT_BC2_SRGB_BLOCK // VK_FORMAT_BC2_SRGB_BLOCK
{ 16, VK_IMAGE_ASPECT_COLOR_BIT, { 16, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::BlockCompressed, DxvkFormatFlags(
DxvkFormatFlag::BlockCompressed,
DxvkFormatFlag::ColorSpaceSrgb),
VkExtent3D { 4, 4, 1 } }, VkExtent3D { 4, 4, 1 } },
// VK_FORMAT_BC3_UNORM_BLOCK // VK_FORMAT_BC3_UNORM_BLOCK
@ -475,7 +488,9 @@ namespace dxvk {
// VK_FORMAT_BC3_SRGB_BLOCK // VK_FORMAT_BC3_SRGB_BLOCK
{ 16, VK_IMAGE_ASPECT_COLOR_BIT, { 16, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::BlockCompressed, DxvkFormatFlags(
DxvkFormatFlag::BlockCompressed,
DxvkFormatFlag::ColorSpaceSrgb),
VkExtent3D { 4, 4, 1 } }, VkExtent3D { 4, 4, 1 } },
// VK_FORMAT_BC4_UNORM_BLOCK // VK_FORMAT_BC4_UNORM_BLOCK
@ -515,7 +530,9 @@ namespace dxvk {
// VK_FORMAT_BC7_SRGB_BLOCK // VK_FORMAT_BC7_SRGB_BLOCK
{ 16, VK_IMAGE_ASPECT_COLOR_BIT, { 16, VK_IMAGE_ASPECT_COLOR_BIT,
DxvkFormatFlag::BlockCompressed, DxvkFormatFlags(
DxvkFormatFlag::BlockCompressed,
DxvkFormatFlag::ColorSpaceSrgb),
VkExtent3D { 4, 4, 1 } }, VkExtent3D { 4, 4, 1 } },
// VK_FORMAT_G8B8G8R8_422_UNORM_KHR // VK_FORMAT_G8B8G8R8_422_UNORM_KHR

1
src/dxvk/dxvk_format.h
View File

@ -7,6 +7,7 @@ namespace dxvk {
enum class DxvkFormatFlag { enum class DxvkFormatFlag {
BlockCompressed = 0, ///< Image format is block compressed BlockCompressed = 0, ///< Image format is block compressed
SampledInteger = 1, ///< Sampled type is an integer type SampledInteger = 1, ///< Sampled type is an integer type
ColorSpaceSrgb = 2, ///< Non-linear SRGB color format
}; };
using DxvkFormatFlags = Flags<DxvkFormatFlag>; using DxvkFormatFlags = Flags<DxvkFormatFlag>;