Skip to content

S
swiftshader
Commit 20aab4e9 by Chris Forbes
Options

Add support for sampling VK_FORMAT_B4G4R4A4_UNORM_PACK32

Bug: b/131246807 Test: dEQP-VK.*b4g4r4a4_unorm* Change-Id: Ifb319c50cf0a9f9e83c0c8074f5631f4726cc380 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30428Tested-by: 's avatarChris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent d573e7e7
Showing with 26 additions and 0 deletions
src/Pipeline/SamplerCore.cpp
...@@ -111,6 +111,12 @@ namespace sw ...@@ -111,6 +111,12 @@ namespace sw
c.y *= Float4(1.0f / 0xFC00); c.y *= Float4(1.0f / 0xFC00);
c.z *= Float4(1.0f / 0xF800); c.z *= Float4(1.0f / 0xF800);
break; break;
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
c.x *= Float4(1.0f / 0xF000);
c.y *= Float4(1.0f / 0xF000);
c.z *= Float4(1.0f / 0xF000);
c.w *= Float4(1.0f / 0xF000);
break;
default: default:
ASSERT(false); ASSERT(false);
} }
...@@ -134,6 +140,13 @@ namespace sw ...@@ -134,6 +140,13 @@ namespace sw
c.y = Float4(As<UShort4>(cs.y)) * Float4(1.0f / 0xFC00); c.y = Float4(As<UShort4>(cs.y)) * Float4(1.0f / 0xFC00);
c.z = Float4(As<UShort4>(cs.z)) * Float4(1.0f / 0xF800); c.z = Float4(As<UShort4>(cs.z)) * Float4(1.0f / 0xF800);
} }
else if (state.textureFormat == VK_FORMAT_B4G4R4A4_UNORM_PACK16)
{
c.x = Float4(As<UShort4>(cs.x)) * Float4(1.0f / 0xF000);
c.y = Float4(As<UShort4>(cs.y)) * Float4(1.0f / 0xF000);
c.z = Float4(As<UShort4>(cs.z)) * Float4(1.0f / 0xF000);
c.w = Float4(As<UShort4>(cs.w)) * Float4(1.0f / 0xF000);
}
else else
{ {
for(int component = 0; component < textureComponentCount(); component++) for(int component = 0; component < textureComponentCount(); component++)
...@@ -205,6 +218,7 @@ namespace sw ...@@ -205,6 +218,7 @@ namespace sw
case VK_FORMAT_R16G16B16A16_SFLOAT: case VK_FORMAT_R16G16B16A16_SFLOAT:
case VK_FORMAT_A2B10G10R10_UNORM_PACK32: case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
case VK_FORMAT_A2B10G10R10_UINT_PACK32: case VK_FORMAT_A2B10G10R10_UINT_PACK32:
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
break; break;
default: default:
ASSERT(false); ASSERT(false);
...@@ -1525,6 +1539,12 @@ namespace sw ...@@ -1525,6 +1539,12 @@ namespace sw
c.y = (c.x & Short4(0x07E0u)) << 5; c.y = (c.x & Short4(0x07E0u)) << 5;
c.x = (c.x & Short4(0xF800u)); c.x = (c.x & Short4(0xF800u));
break; break;
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
c.w = (c.x << 12) & Short4(0xF000);
c.z = (c.x) & Short4(0xF000);
c.y = (c.x << 4) & Short4(0xF000);
c.x = (c.x << 8) & Short4(0xF000);
break;
default: default:
ASSERT(false); ASSERT(false);
} }
......
src/Vulkan/VkFormat.cpp
...@@ -1698,6 +1698,7 @@ bool Format::has16bitTextureFormat() const ...@@ -1698,6 +1698,7 @@ bool Format::has16bitTextureFormat() const
{ {
switch(format) switch(format)
{ {
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16:
return true; return true;
case VK_FORMAT_R8_SNORM: case VK_FORMAT_R8_SNORM:
...@@ -1764,6 +1765,7 @@ bool Format::has8bitTextureComponents() const ...@@ -1764,6 +1765,7 @@ bool Format::has8bitTextureComponents() const
case VK_FORMAT_R8G8B8A8_SINT: case VK_FORMAT_R8G8B8A8_SINT:
case VK_FORMAT_R8G8B8A8_UINT: case VK_FORMAT_R8G8B8A8_UINT:
return true; return true;
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16:
case VK_FORMAT_R32_SFLOAT: case VK_FORMAT_R32_SFLOAT:
case VK_FORMAT_R32G32_SFLOAT: case VK_FORMAT_R32G32_SFLOAT:
...@@ -1800,6 +1802,7 @@ bool Format::has16bitTextureComponents() const ...@@ -1800,6 +1802,7 @@ bool Format::has16bitTextureComponents() const
{ {
switch(format) switch(format)
{ {
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16:
case VK_FORMAT_R8_SNORM: case VK_FORMAT_R8_SNORM:
case VK_FORMAT_R8G8_SNORM: case VK_FORMAT_R8G8_SNORM:
...@@ -1851,6 +1854,7 @@ bool Format::has32bitIntegerTextureComponents() const ...@@ -1851,6 +1854,7 @@ bool Format::has32bitIntegerTextureComponents() const
{ {
switch(format) switch(format)
{ {
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16:
case VK_FORMAT_R8_SNORM: case VK_FORMAT_R8_SNORM:
case VK_FORMAT_R8G8_SNORM: case VK_FORMAT_R8G8_SNORM:
...@@ -1904,6 +1908,7 @@ bool Format::hasYuvFormat() const ...@@ -1904,6 +1908,7 @@ bool Format::hasYuvFormat() const
{ {
case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM: case VK_FORMAT_G8_B8R8_2PLANE_420_UNORM:
return true; return true;
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16:
case VK_FORMAT_R8_SNORM: case VK_FORMAT_R8_SNORM:
case VK_FORMAT_R8G8_SNORM: case VK_FORMAT_R8G8_SNORM:
...@@ -1976,6 +1981,7 @@ bool Format::isRGBComponent(int component) const ...@@ -1976,6 +1981,7 @@ bool Format::isRGBComponent(int component) const
case VK_FORMAT_R32G32_UINT: case VK_FORMAT_R32G32_UINT:
case VK_FORMAT_R32G32_SFLOAT: case VK_FORMAT_R32G32_SFLOAT:
return component < 2; return component < 2;
case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
case VK_FORMAT_R5G6B5_UNORM_PACK16: case VK_FORMAT_R5G6B5_UNORM_PACK16:
case VK_FORMAT_R8G8B8A8_SNORM: case VK_FORMAT_R8G8B8A8_SNORM:
case VK_FORMAT_R8G8B8A8_UNORM: case VK_FORMAT_R8G8B8A8_UNORM:
......
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