Add 10-bit unorm support to the floating point version of writeColor
This CL adds support for 10-bit channels unorm formats to
the floating point version of writeColor.
Bug: b/204322086
Change-Id: Ib7fdc997ccff8dbee99c19e801f1a5b965682390
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/69772
Tested-by: Alexis Hétu <sugoi@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Commit-Queue: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Pipeline/PixelRoutine.cpp b/src/Pipeline/PixelRoutine.cpp
index d08cc82..de4799a 100644
--- a/src/Pipeline/PixelRoutine.cpp
+++ b/src/Pipeline/PixelRoutine.cpp
@@ -2529,6 +2529,17 @@
color.x = Min(Max(color.x, 0.0f), 1.0f); // TODO(b/204560089): Omit clamp if redundant
color.x = As<Float4>(RoundInt(color.x * 0xFF));
break;
+ case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
+ case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
+ color.w = Min(Max(color.w, 0.0f), 1.0f); // TODO(b/204560089): Omit clamp if redundant
+ color.w = As<Float4>(RoundInt(color.w * 0x3));
+ color.z = Min(Max(color.z, 0.0f), 1.0f); // TODO(b/204560089): Omit clamp if redundant
+ color.z = As<Float4>(RoundInt(color.z * 0x3FF));
+ color.y = Min(Max(color.y, 0.0f), 1.0f); // TODO(b/204560089): Omit clamp if redundant
+ color.y = As<Float4>(RoundInt(color.y * 0x3FF));
+ color.x = Min(Max(color.x, 0.0f), 1.0f); // TODO(b/204560089): Omit clamp if redundant
+ color.x = As<Float4>(RoundInt(color.x * 0x3FF));
+ break;
case VK_FORMAT_R16G16B16A16_UNORM:
color.w = Min(Max(color.w, 0.0f), 1.0f); // TODO(b/204560089): Omit clamp if redundant
color.w = As<Float4>(RoundInt(color.w * 0xFFFF));
@@ -2575,6 +2586,8 @@
case VK_FORMAT_R8_UNORM:
case VK_FORMAT_A2B10G10R10_UINT_PACK32:
case VK_FORMAT_A2R10G10B10_UINT_PACK32:
+ case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
+ case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
break;
case VK_FORMAT_R16G16_SFLOAT:
case VK_FORMAT_R32G32_SFLOAT:
@@ -3133,6 +3146,7 @@
}
break;
case VK_FORMAT_A2B10G10R10_UINT_PACK32:
+ case VK_FORMAT_A2B10G10R10_UNORM_PACK32:
if((writeMask & 0x0000000F) != 0x0)
{
Int2 mergedMask, packedCol, value;
@@ -3162,6 +3176,7 @@
}
break;
case VK_FORMAT_A2R10G10B10_UINT_PACK32:
+ case VK_FORMAT_A2R10G10B10_UNORM_PACK32:
if((writeMask & 0x0000000F) != 0x0)
{
Int2 mergedMask, packedCol, value;
@@ -3179,7 +3194,7 @@
}
*Pointer<Int2>(buffer) = (As<Int2>(packed) & mergedMask) | (value & ~mergedMask);
- buffer += *Pointer<Int>(data + OFFSET(DrawData, colorPitchB[index]));
+ buffer += pitchB;
value = *Pointer<Int2>(buffer, 16);
mergedMask = *Pointer<Int2>(constants + OFFSET(Constants, maskD23Q) + xMask * 8);
