rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-27 13:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[d3d11] Implemented border color support

Browse Source
This commit is contained in:
Philip Rebohle 2017-12-21 16:54:20 +01:00
parent 3e4e5191a8
commit 289da8065d
3 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/d3d11/d3d11_device.cpp
View File

@ -808,12 +808,13 @@ namespace dxvk {
info.addressModeW = DecodeAddressMode(pSamplerDesc->AddressW);
info.compareOp = DecodeCompareOp(pSamplerDesc->ComparisonFunc);
info.borderColor = VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
info.usePixelCoord = VK_FALSE;
info.usePixelCoord = VK_FALSE; // Not supported in D3D11
// Try to find a matching border color if clamp to border is enabled
if (info.addressModeU == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER
|| info.addressModeV == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER
|| info.addressModeW == VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER)
Logger::warn("D3D11: Border color not supported yet");
info.borderColor = DecodeBorderColor(pSamplerDesc->BorderColor);
// Create sampler object if the application requests it
if (ppSamplerState == nullptr)

70
src/d3d11/d3d11_util.cpp
View File

@ -15,44 +15,56 @@ namespace dxvk {
}
VkCompareOp DecodeCompareOp(
D3D11_COMPARISON_FUNC mode) {
switch (mode) {
case D3D11_COMPARISON_NEVER:
return VK_COMPARE_OP_NEVER;
case D3D11_COMPARISON_LESS:
return VK_COMPARE_OP_LESS;
case D3D11_COMPARISON_EQUAL:
return VK_COMPARE_OP_EQUAL;
case D3D11_COMPARISON_LESS_EQUAL:
return VK_COMPARE_OP_LESS_OR_EQUAL;
case D3D11_COMPARISON_GREATER:
return VK_COMPARE_OP_GREATER;
case D3D11_COMPARISON_NOT_EQUAL:
return VK_COMPARE_OP_NOT_EQUAL;
case D3D11_COMPARISON_GREATER_EQUAL:
return VK_COMPARE_OP_GREATER_OR_EQUAL;
case D3D11_COMPARISON_ALWAYS:
return VK_COMPARE_OP_ALWAYS;
VkBorderColor DecodeBorderColor(const FLOAT BorderColor[4]) {
struct BorderColorEntry {
float r, g, b, a;
VkBorderColor bc;
};
// Vulkan only supports a very limited set of border colors
const std::array<BorderColorEntry, 3> borderColorMap = {{
{ 0.0f, 0.0f, 0.0f, 0.0f, VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK },
{ 0.0f, 0.0f, 0.0f, 1.0f, VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK },
{ 1.0f, 1.0f, 1.0f, 1.0f, VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK },
}};
for (const auto& e : borderColorMap) {
if (e.r == BorderColor[0] && e.g == BorderColor[1]
&& e.b == BorderColor[2] && e.a == BorderColor[3])
return e.bc;
}
Logger::warn(str::format(
"D3D11Device: No matching border color found for (",
BorderColor[0], ",", BorderColor[1], ",",
BorderColor[2], ",", BorderColor[3], ")"));
return VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK;
}
VkCompareOp DecodeCompareOp(D3D11_COMPARISON_FUNC Mode) {
switch (Mode) {
case D3D11_COMPARISON_NEVER: return VK_COMPARE_OP_NEVER;
case D3D11_COMPARISON_LESS: return VK_COMPARE_OP_LESS;
case D3D11_COMPARISON_EQUAL: return VK_COMPARE_OP_EQUAL;
case D3D11_COMPARISON_LESS_EQUAL: return VK_COMPARE_OP_LESS_OR_EQUAL;
case D3D11_COMPARISON_GREATER: return VK_COMPARE_OP_GREATER;
case D3D11_COMPARISON_NOT_EQUAL: return VK_COMPARE_OP_NOT_EQUAL;
case D3D11_COMPARISON_GREATER_EQUAL: return VK_COMPARE_OP_GREATER_OR_EQUAL;
case D3D11_COMPARISON_ALWAYS: return VK_COMPARE_OP_ALWAYS;
default:
Logger::err(str::format("D3D11: Unsupported compare op: ", mode));
Logger::err(str::format("D3D11: Unsupported compare op: ", Mode));
return VK_COMPARE_OP_ALWAYS;
}
}
VkMemoryPropertyFlags GetMemoryFlagsForUsage(D3D11_USAGE usage) {
VkMemoryPropertyFlags GetMemoryFlagsForUsage(D3D11_USAGE Usage) {
VkMemoryPropertyFlags memoryFlags = 0;
switch (usage) {
switch (Usage) {
case D3D11_USAGE_DEFAULT:
case D3D11_USAGE_IMMUTABLE:
memoryFlags |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;

7
src/d3d11/d3d11_util.h
View File

@ -12,10 +12,13 @@ namespace dxvk {
UINT Count,
VkSampleCountFlagBits* pCount);
VkBorderColor DecodeBorderColor(
const FLOAT BorderColor[4]);
VkCompareOp DecodeCompareOp(
D3D11_COMPARISON_FUNC mode);
D3D11_COMPARISON_FUNC Mode);
VkMemoryPropertyFlags GetMemoryFlagsForUsage(
D3D11_USAGE usage);
D3D11_USAGE Usage);
}