From b857f55a94aedb6ef27ed5dc48dc8aa0fb15667f Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 9 Oct 2018 22:53:48 -0700 Subject: Fixed rgba8_typeless texture creation in Vulkan --- Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp | 12 ++++++------ Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'Graphics') diff --git a/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp b/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp index e995352c..f060b465 100644 --- a/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp +++ b/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp @@ -111,9 +111,9 @@ public: INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGB10A2_UINT, RGB10A2_UINT, RGB10A2_UINT, UNKNOWN, RGB10A2_UINT); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_R11G11B10_FLOAT, R11G11B10_FLOAT, R11G11B10_FLOAT, UNKNOWN, R11G11B10_FLOAT); - INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_TYPELESS, RGBA8_UNORM_SRGB, RGBA8_UNORM_SRGB, UNKNOWN, RGBA8_UNORM_SRGB); + INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_TYPELESS, RGBA8_UNORM_SRGB, RGBA8_UNORM_SRGB, UNKNOWN, RGBA8_UNORM); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_UNORM, RGBA8_UNORM, RGBA8_UNORM, UNKNOWN, RGBA8_UNORM); - INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_UNORM_SRGB, RGBA8_UNORM_SRGB, RGBA8_UNORM_SRGB, UNKNOWN, RGBA8_UNORM_SRGB); + INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_UNORM_SRGB, RGBA8_UNORM_SRGB, RGBA8_UNORM_SRGB, UNKNOWN, RGBA8_UNORM); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_UINT, RGBA8_UINT, RGBA8_UINT, UNKNOWN, RGBA8_UINT); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_SNORM, RGBA8_SNORM, RGBA8_SNORM, UNKNOWN, RGBA8_SNORM); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_RGBA8_SINT, RGBA8_SINT, RGBA8_SINT, UNKNOWN, RGBA8_SINT); @@ -186,10 +186,10 @@ public: INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRA8_UNORM, BGRA8_UNORM, BGRA8_UNORM, UNKNOWN, BGRA8_UNORM); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRX8_UNORM, BGRX8_UNORM, BGRX8_UNORM, UNKNOWN, BGRX8_UNORM); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, R10G10B10_XR_BIAS_A2_UNORM, UNKNOWN, UNKNOWN, UNKNOWN); - INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRA8_TYPELESS, BGRA8_UNORM_SRGB, BGRA8_UNORM_SRGB, UNKNOWN, BGRA8_UNORM_SRGB); - INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRA8_UNORM_SRGB, BGRA8_UNORM_SRGB, BGRA8_UNORM_SRGB, UNKNOWN, BGRA8_UNORM_SRGB); - INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRX8_TYPELESS, BGRX8_UNORM_SRGB, BGRX8_UNORM_SRGB, UNKNOWN, BGRX8_UNORM_SRGB); - INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRX8_UNORM_SRGB, BGRX8_UNORM_SRGB, BGRX8_UNORM_SRGB, UNKNOWN, BGRX8_UNORM_SRGB); + INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRA8_TYPELESS, BGRA8_UNORM_SRGB, BGRA8_UNORM_SRGB, UNKNOWN, BGRA8_UNORM); + INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRA8_UNORM_SRGB, BGRA8_UNORM_SRGB, BGRA8_UNORM_SRGB, UNKNOWN, BGRA8_UNORM); + INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRX8_TYPELESS, BGRX8_UNORM_SRGB, BGRX8_UNORM_SRGB, UNKNOWN, BGRX8_UNORM); + INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BGRX8_UNORM_SRGB, BGRX8_UNORM_SRGB, BGRX8_UNORM_SRGB, UNKNOWN, BGRX8_UNORM); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BC6H_TYPELESS, BC6H_UF16, UNKNOWN, UNKNOWN, UNKNOWN); INIT_TEX_VIEW_FORMAT_INFO( TEX_FORMAT_BC6H_UF16, BC6H_UF16, UNKNOWN, UNKNOWN, UNKNOWN); diff --git a/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp index 4562a073..58e99eb5 100644 --- a/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp @@ -78,6 +78,8 @@ TextureVkImpl :: TextureVkImpl(IReferenceCounters* pRefCounters, TEXTURE_VIEW_TYPE DefaultTexView; if(m_Desc.BindFlags & BIND_DEPTH_STENCIL) DefaultTexView = TEXTURE_VIEW_DEPTH_STENCIL; + else if (m_Desc.BindFlags & BIND_UNORDERED_ACCESS) + DefaultTexView = TEXTURE_VIEW_UNORDERED_ACCESS; else if (m_Desc.BindFlags & BIND_RENDER_TARGET) DefaultTexView = TEXTURE_VIEW_RENDER_TARGET; else -- cgit v1.2.3