Commit d6407598 by Alexis Hetu Committed by Alexis Hétu

Remove depth+stencil formats from the Blitter

Blitting should be done either using the depth aspect or the stencil aspect, not both at once. Bug: b/144353295 Change-Id: I5b7a81d3c2b915f6ebb5854edc814f335eb2cac5 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38470 Presubmit-Ready: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 2377845d
...@@ -450,12 +450,10 @@ namespace sw ...@@ -450,12 +450,10 @@ namespace sw
case VK_FORMAT_D16_UNORM: case VK_FORMAT_D16_UNORM:
c.x = Float(Int((*Pointer<UShort>(element)))); c.x = Float(Int((*Pointer<UShort>(element))));
break; break;
case VK_FORMAT_D24_UNORM_S8_UINT:
case VK_FORMAT_X8_D24_UNORM_PACK32: case VK_FORMAT_X8_D24_UNORM_PACK32:
c.x = Float(Int((*Pointer<UInt>(element) & UInt(0xFFFFFF00)) >> 8)); c.x = Float(Int((*Pointer<UInt>(element) & UInt(0xFFFFFF00)) >> 8));
break; break;
case VK_FORMAT_D32_SFLOAT: case VK_FORMAT_D32_SFLOAT:
case VK_FORMAT_D32_SFLOAT_S8_UINT:
c.x = *Pointer<Float>(element); c.x = *Pointer<Float>(element);
break; break;
case VK_FORMAT_S8_UINT: case VK_FORMAT_S8_UINT:
...@@ -985,12 +983,10 @@ namespace sw ...@@ -985,12 +983,10 @@ namespace sw
case VK_FORMAT_D16_UNORM: case VK_FORMAT_D16_UNORM:
*Pointer<UShort>(element) = UShort(RoundInt(Float(c.x))); *Pointer<UShort>(element) = UShort(RoundInt(Float(c.x)));
break; break;
case VK_FORMAT_D24_UNORM_S8_UINT:
case VK_FORMAT_X8_D24_UNORM_PACK32: case VK_FORMAT_X8_D24_UNORM_PACK32:
*Pointer<UInt>(element) = UInt(RoundInt(Float(c.x)) << 8); *Pointer<UInt>(element) = UInt(RoundInt(Float(c.x)) << 8);
break; break;
case VK_FORMAT_D32_SFLOAT: case VK_FORMAT_D32_SFLOAT:
case VK_FORMAT_D32_SFLOAT_S8_UINT:
*Pointer<Float>(element) = c.x; *Pointer<Float>(element) = c.x;
break; break;
case VK_FORMAT_S8_UINT: case VK_FORMAT_S8_UINT:
......
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