Skip to content

S
swiftshader
Commit f1ea9895 by Alexis Hetu Committed by Alexis Hétu
Options

Fixed blitter operation from alphaless types

Some types without alpha were not correctly setting the alpha value, so copying to a type with alpha was causing the image to not appear (due to it being almost completely transparent). Change-Id: Ib12c291bd5c51628e0579285731033372656f6a0 Reviewed-on: https://swiftshader-review.googlesource.com/4391Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarAlexis Hétu <sugoi@google.com>
parent e727775c
Showing with 19 additions and 33 deletions
src/Renderer/Blitter.cpp
...@@ -131,56 +131,46 @@ namespace sw ...@@ -131,56 +131,46 @@ namespace sw
{ {
case FORMAT_L8: case FORMAT_L8:
c.xyz = Float(Int(*Pointer<Byte>(element))); c.xyz = Float(Int(*Pointer<Byte>(element)));
c.w = float(0xFF);
break; break;
case FORMAT_A8: case FORMAT_A8:
c.xyz = 0.0f;
c.w = Float(Int(*Pointer<Byte>(element))); c.w = Float(Int(*Pointer<Byte>(element)));
break; break;
case FORMAT_R8I: case FORMAT_R8I:
c.yzw = 0.0f;
c.x = Float(Int(*Pointer<SByte>(element)));
break;
case FORMAT_R8UI:
c.yzw = 0.0f;
c.x = Float(Int(*Pointer<Byte>(element)));
break;
case FORMAT_R8I_SNORM: case FORMAT_R8I_SNORM:
c.yzw = 0.0f;
c.x = Float(Int(*Pointer<SByte>(element))); c.x = Float(Int(*Pointer<SByte>(element)));
c.w = float(0x7F);
break; break;
case FORMAT_R8: case FORMAT_R8:
c.yzw = 0.0f; case FORMAT_R8UI:
c.x = Float(Int(*Pointer<Byte>(element))); c.x = Float(Int(*Pointer<Byte>(element)));
c.w = float(0xFF);
break; break;
case FORMAT_R16I: case FORMAT_R16I:
c.yzw = 0.0f;
c.x = Float(Int(*Pointer<Short>(element))); c.x = Float(Int(*Pointer<Short>(element)));
c.w = float(0x7FFF);
break; break;
case FORMAT_R16UI: case FORMAT_R16UI:
c.yzw = 0.0f;
c.x = Float(Int(*Pointer<UShort>(element))); c.x = Float(Int(*Pointer<UShort>(element)));
c.w = float(0xFFFF);
break; break;
case FORMAT_R32I: case FORMAT_R32I:
c.yzw = 0.0f;
c.x = Float(Int(*Pointer<Int>(element))); c.x = Float(Int(*Pointer<Int>(element)));
c.w = float(0x7FFFFFFF);
break; break;
case FORMAT_R32UI: case FORMAT_R32UI:
c.yzw = 0.0f;
c.x = Float(Int(*Pointer<UInt>(element))); c.x = Float(Int(*Pointer<UInt>(element)));
c.w = float(0xFFFFFFFF);
break; break;
case FORMAT_A8R8G8B8: case FORMAT_A8R8G8B8:
c = Float4(*Pointer<Byte4>(element)).zyxw; c = Float4(*Pointer<Byte4>(element)).zyxw;
break; break;
case FORMAT_A8B8G8R8I: case FORMAT_A8B8G8R8I:
c = Float4(*Pointer<SByte4>(element));
break;
case FORMAT_A8B8G8R8UI:
c = Float4(*Pointer<Byte4>(element));
break;
case FORMAT_A8B8G8R8I_SNORM: case FORMAT_A8B8G8R8I_SNORM:
c = Float4(*Pointer<SByte4>(element)); c = Float4(*Pointer<SByte4>(element));
break; break;
case FORMAT_A8B8G8R8: case FORMAT_A8B8G8R8:
case FORMAT_A8B8G8R8UI:
c = Float4(*Pointer<Byte4>(element)); c = Float4(*Pointer<Byte4>(element));
break; break;
case FORMAT_X8R8G8B8: case FORMAT_X8R8G8B8:
...@@ -191,25 +181,21 @@ namespace sw ...@@ -191,25 +181,21 @@ namespace sw
c.z = Float(Int(*Pointer<Byte>(element + 0))); c.z = Float(Int(*Pointer<Byte>(element + 0)));
c.y = Float(Int(*Pointer<Byte>(element + 1))); c.y = Float(Int(*Pointer<Byte>(element + 1)));
c.x = Float(Int(*Pointer<Byte>(element + 2))); c.x = Float(Int(*Pointer<Byte>(element + 2)));
c.w = float(0xFF);
break; break;
case FORMAT_B8G8R8: case FORMAT_B8G8R8:
c.x = Float(Int(*Pointer<Byte>(element + 0))); c.x = Float(Int(*Pointer<Byte>(element + 0)));
c.y = Float(Int(*Pointer<Byte>(element + 1))); c.y = Float(Int(*Pointer<Byte>(element + 1)));
c.z = Float(Int(*Pointer<Byte>(element + 2))); c.z = Float(Int(*Pointer<Byte>(element + 2)));
break;
case FORMAT_X8B8G8R8I:
c = Float4(*Pointer<SByte4>(element));
c.w = float(0x7F);
break;
case FORMAT_X8B8G8R8UI:
c = Float4(*Pointer<Byte4>(element));
c.w = float(0xFF); c.w = float(0xFF);
break; break;
case FORMAT_X8B8G8R8I:
case FORMAT_X8B8G8R8I_SNORM: case FORMAT_X8B8G8R8I_SNORM:
c = Float4(*Pointer<SByte4>(element)); c = Float4(*Pointer<SByte4>(element));
c.w = float(0x7F); c.w = float(0x7F);
break; break;
case FORMAT_X8B8G8R8: case FORMAT_X8B8G8R8:
case FORMAT_X8B8G8R8UI:
c = Float4(*Pointer<Byte4>(element)); c = Float4(*Pointer<Byte4>(element));
c.w = float(0xFF); c.w = float(0xFF);
break; break;
...@@ -243,37 +229,37 @@ namespace sw ...@@ -243,37 +229,37 @@ namespace sw
c.w = float(0xFFFFFFFF); c.w = float(0xFFFFFFFF);
break; break;
case FORMAT_G8R8I: case FORMAT_G8R8I:
c.x = Float(Int(*Pointer<SByte>(element + 0)));
c.y = Float(Int(*Pointer<SByte>(element + 1)));
break;
case FORMAT_G8R8UI:
c.x = Float(Int(*Pointer<Byte>(element + 0)));
c.y = Float(Int(*Pointer<Byte>(element + 1)));
break;
case FORMAT_G8R8I_SNORM: case FORMAT_G8R8I_SNORM:
c.x = Float(Int(*Pointer<SByte>(element + 0))); c.x = Float(Int(*Pointer<SByte>(element + 0)));
c.y = Float(Int(*Pointer<SByte>(element + 1))); c.y = Float(Int(*Pointer<SByte>(element + 1)));
c.w = float(0x7F);
break; break;
case FORMAT_G8R8: case FORMAT_G8R8:
case FORMAT_G8R8UI:
c.x = Float(Int(*Pointer<Byte>(element + 0))); c.x = Float(Int(*Pointer<Byte>(element + 0)));
c.y = Float(Int(*Pointer<Byte>(element + 1))); c.y = Float(Int(*Pointer<Byte>(element + 1)));
c.w = float(0xFF);
break; break;
case FORMAT_G16R16I: case FORMAT_G16R16I:
c.x = Float(Int(*Pointer<Short>(element + 0))); c.x = Float(Int(*Pointer<Short>(element + 0)));
c.y = Float(Int(*Pointer<Short>(element + 2))); c.y = Float(Int(*Pointer<Short>(element + 2)));
c.w = float(0x7FFF);
break; break;
case FORMAT_G16R16: case FORMAT_G16R16:
case FORMAT_G16R16UI: case FORMAT_G16R16UI:
c.x = Float(Int(*Pointer<UShort>(element + 0))); c.x = Float(Int(*Pointer<UShort>(element + 0)));
c.y = Float(Int(*Pointer<UShort>(element + 2))); c.y = Float(Int(*Pointer<UShort>(element + 2)));
c.w = float(0xFFFF);
break; break;
case FORMAT_G32R32I: case FORMAT_G32R32I:
c.x = Float(Int(*Pointer<Int>(element + 0))); c.x = Float(Int(*Pointer<Int>(element + 0)));
c.y = Float(Int(*Pointer<Int>(element + 4))); c.y = Float(Int(*Pointer<Int>(element + 4)));
c.w = float(0x7FFFFFFF);
break; break;
case FORMAT_G32R32UI: case FORMAT_G32R32UI:
c.x = Float(Int(*Pointer<UInt>(element + 0))); c.x = Float(Int(*Pointer<UInt>(element + 0)));
c.y = Float(Int(*Pointer<UInt>(element + 4))); c.y = Float(Int(*Pointer<UInt>(element + 4)));
c.w = float(0xFFFFFFFF);
break; break;
case FORMAT_A32B32G32R32F: case FORMAT_A32B32G32R32F:
c = *Pointer<Float4>(element); c = *Pointer<Float4>(element);
......
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