diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-04-15 20:20:53 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-04-15 20:20:53 +0000 |
| commit | dd168cf1d0dcb441fedaab6193ab564e39b9964e (patch) | |
| tree | c2c077cfb71e195da8e1175343f20f6bc6392d09 /Graphics/GraphicsEngineD3D12 | |
| parent | Vulkan pipeline object creation - part 2 (diff) | |
| download | DiligentCore-dd168cf1d0dcb441fedaab6193ab564e39b9964e.tar.gz DiligentCore-dd168cf1d0dcb441fedaab6193ab564e39b9964e.zip | |
Implemented vulkan sampler creation
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp index ab3f4be7..c9053465 100644 --- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp +++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp @@ -286,14 +286,14 @@ D3D12_STATIC_BORDER_COLOR BorderColorToD3D12StaticBorderColor(const Float32 Bord { D3D12_STATIC_BORDER_COLOR StaticBorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK; if(BorderColor[0] == 0 && BorderColor[1] == 0 && BorderColor[2] == 0 && BorderColor[3] == 0) - StaticBorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK; - else if(BorderColor[0] == 0 && BorderColor[1] == 0 && BorderColor[2] == 0 && BorderColor[3] == 1) StaticBorderColor = D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK; - else if(BorderColor[0] == 1 && BorderColor[1] == 1 && BorderColor[2] == 1 && BorderColor[3] == 0) + else if(BorderColor[0] == 0 && BorderColor[1] == 0 && BorderColor[2] == 0 && BorderColor[3] == 1) + StaticBorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK; + else if(BorderColor[0] == 1 && BorderColor[1] == 1 && BorderColor[2] == 1 && BorderColor[3] == 1) StaticBorderColor = D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE; else { - LOG_ERROR_MESSAGE("Static samplers only allow transparent black (0,0,0,1), opaque black (0,0,0,0) or opaque white (1,1,1,0) as border colors."); + LOG_ERROR_MESSAGE("Static samplers only allow transparent black (0,0,0,0), opaque black (0,0,0,1) or opaque white (1,1,1,1) as border colors."); } return StaticBorderColor; } |