Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-16 15:00:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated for latest d3dx12.h fixes

Browse Source
This commit is contained in:
Chuck Walbourn 2020-04-30 01:06:28 -07:00
parent 36c27579b9
commit 6ca1e02f6a
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DirectXTex/d3dx12.h
View File

@ -88,21 +88,21 @@ struct CD3DX12_VIEWPORT : public D3D12_VIEWPORT
case D3D12_RESOURCE_DIMENSION_BUFFER: case D3D12_RESOURCE_DIMENSION_BUFFER:
TopLeftX = topLeftX; TopLeftX = topLeftX;
TopLeftY = 0.0f; TopLeftY = 0.0f;
Width = Desc.Width - topLeftX; Width = float(Desc.Width) - topLeftX;
Height = 1.0f; Height = 1.0f;
break; break;
case D3D12_RESOURCE_DIMENSION_TEXTURE1D: case D3D12_RESOURCE_DIMENSION_TEXTURE1D:
TopLeftX = topLeftX; TopLeftX = topLeftX;
TopLeftY = 0.0f; TopLeftY = 0.0f;
Width = (SubresourceWidth ? SubresourceWidth : 1.0f) - topLeftX; Width = (SubresourceWidth ? float(SubresourceWidth) : 1.0f) - topLeftX;
Height = 1.0f; Height = 1.0f;
break; break;
case D3D12_RESOURCE_DIMENSION_TEXTURE2D: case D3D12_RESOURCE_DIMENSION_TEXTURE2D:
case D3D12_RESOURCE_DIMENSION_TEXTURE3D: case D3D12_RESOURCE_DIMENSION_TEXTURE3D:
TopLeftX = topLeftX; TopLeftX = topLeftX;
TopLeftY = topLeftY; TopLeftY = topLeftY;
Width = (SubresourceWidth ? SubresourceWidth : 1.0f) - topLeftX; Width = (SubresourceWidth ? float(SubresourceWidth) : 1.0f) - topLeftX;
Height = (SubresourceHeight ? SubresourceHeight: 1.0f) - topLeftY; Height = (SubresourceHeight ? float(SubresourceHeight) : 1.0f) - topLeftY;
break; break;
default: break; default: break;
} }
@ -2414,7 +2414,6 @@ struct D3DX12_MESH_SHADER_PIPELINE_STATE_DESC
UINT SampleMask; UINT SampleMask;
D3D12_RASTERIZER_DESC RasterizerState; D3D12_RASTERIZER_DESC RasterizerState;
D3D12_DEPTH_STENCIL_DESC DepthStencilState; D3D12_DEPTH_STENCIL_DESC DepthStencilState;
D3D12_INDEX_BUFFER_STRIP_CUT_VALUE IBStripCutValue;
D3D12_PRIMITIVE_TOPOLOGY_TYPE PrimitiveTopologyType; D3D12_PRIMITIVE_TOPOLOGY_TYPE PrimitiveTopologyType;
UINT NumRenderTargets; UINT NumRenderTargets;
DXGI_FORMAT RTVFormats[ D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT ]; DXGI_FORMAT RTVFormats[ D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT ];
@ -2459,7 +2458,6 @@ struct CD3DX12_PIPELINE_STATE_STREAM2
: Flags(Desc.Flags) : Flags(Desc.Flags)
, NodeMask(Desc.NodeMask) , NodeMask(Desc.NodeMask)
, pRootSignature(Desc.pRootSignature) , pRootSignature(Desc.pRootSignature)
, IBStripCutValue(Desc.IBStripCutValue)
, PrimitiveTopologyType(Desc.PrimitiveTopologyType) , PrimitiveTopologyType(Desc.PrimitiveTopologyType)
, PS(Desc.PS) , PS(Desc.PS)
, AS(Desc.AS) , AS(Desc.AS)
@ -2581,7 +2579,6 @@ struct CD3DX12_PIPELINE_STATE_STREAM1
: Flags(Desc.Flags) : Flags(Desc.Flags)
, NodeMask(Desc.NodeMask) , NodeMask(Desc.NodeMask)
, pRootSignature(Desc.pRootSignature) , pRootSignature(Desc.pRootSignature)
, IBStripCutValue(Desc.IBStripCutValue)
, PrimitiveTopologyType(Desc.PrimitiveTopologyType) , PrimitiveTopologyType(Desc.PrimitiveTopologyType)
, PS(Desc.PS) , PS(Desc.PS)
, BlendState(CD3DX12_BLEND_DESC(Desc.BlendState)) , BlendState(CD3DX12_BLEND_DESC(Desc.BlendState))
@ -3092,7 +3089,6 @@ inline HRESULT D3DX12ParsePipelineStream(const D3D12_PIPELINE_STATE_STREAM_DESC&
default: default:
pCallbacks->ErrorUnknownSubobject(SubobjectType); pCallbacks->ErrorUnknownSubobject(SubobjectType);
return E_INVALIDARG; return E_INVALIDARG;
break;
} }
} }