Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk: Fix border color selection

Browse Source
This commit is contained in:
kd-11
2018-04-21 18:12:18 +03:00
committed by kd-11
parent c5d1f30e82
commit 40ae5e605d
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/VK/VKFormats.cpp
+25 -13
View File
@@ -70,24 +70,36 @@ namespace vk
VkBorderColor get_border_color(u32 color) VkBorderColor get_border_color(u32 color)
{ {
//TODO: Improve accuracy switch (color)
auto color4 = rsx::decode_border_color(color); {
case 0x00000000:
f32 mag = (color4.r * color4.r) + (color4.g * color4.g) + (color4.b * color4.b); {
if (mag > 0.f) mag = sqrtf(mag); return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
mag *= 0.3333f; }
case 0xFFFFFFFF:
if (mag > 0.8f && color4.a > 0.f)
{ {
//If color elements are brighter than roughly 0.5 average, use white border
return VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE; return VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE;
} }
else case 0xFF000000:
{ {
if (color4.a > 0.5f) return VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK;
return VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK; }
default:
{
auto color4 = rsx::decode_border_color(color);
if ((color4.r + color4.g + color4.b) > 1.35f)
{
//If color elements are brighter than roughly 0.5 average, use white border
return VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE;
}
else else
return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK; {
if (color4.a > 0.5f)
return VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK;
else
return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
}
}
} }
} }