Fixed rebase conflict

SRSaunders · Feb 25, 2024 · bb9d8ae · bb9d8ae
1 parent 6188e57
commit bb9d8ae
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/d3d12/d3d12-texture.cpp b/src/d3d12/d3d12-texture.cpp
@@ -534,11 +534,7 @@ namespace nvrhi::d3d12
         D3D12_SHADER_RESOURCE_VIEW_DESC viewDesc = {};
 
         viewDesc.Format = getDxgiFormatMapping(format == Format::UNKNOWN ? desc.format : format).srvFormat;
-        viewDesc.Shader4ComponentMapping =
-            D3D12_ENCODE_SHADER_4_COMPONENT_MAPPING(desc.componentMapping.bits.r,
-                                                    desc.componentMapping.bits.g,
-                                                    desc.componentMapping.bits.b,
-                                                    desc.componentMapping.bits.a);
+        TranslateComponentMapping(desc.componentMapping, viewDesc.Shader4ComponentMapping);
 
         uint32_t planeSlice = (viewDesc.Format == DXGI_FORMAT_X24_TYPELESS_G8_UINT) ? 1 : 0;