diff options
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
6 files changed, 18 insertions, 18 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp index 7a08fe85..2dbb5190 100644 --- a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp +++ b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp @@ -217,22 +217,22 @@ void CommandContext::TransitionResource(const StateTransitionDesc& Barrier) { const auto& TexDesc = pTextureD3D12Impl->GetDesc(); VERIFY(Barrier.FirstMipLevel < TexDesc.MipLevels, "First mip level is out of range"); - VERIFY(Barrier.MipLevelsCount == StateTransitionDesc::RemainingMipLevels || Barrier.FirstMipLevel + Barrier.MipLevelsCount <= TexDesc.MipLevels, + VERIFY(Barrier.MipLevelsCount == REMAINING_MIP_LEVELS || Barrier.FirstMipLevel + Barrier.MipLevelsCount <= TexDesc.MipLevels, "Invalid mip level range"); VERIFY(Barrier.FirstArraySlice < TexDesc.ArraySize, "First array slice is out of range"); - VERIFY(Barrier.ArraySliceCount == StateTransitionDesc::RemainingArraySlices || Barrier.FirstArraySlice + Barrier.ArraySliceCount <= TexDesc.ArraySize, + VERIFY(Barrier.ArraySliceCount == REMAINING_ARRAY_SLICES || Barrier.FirstArraySlice + Barrier.ArraySliceCount <= TexDesc.ArraySize, "Invalid array slice range"); - if (Barrier.FirstMipLevel == 0 && (Barrier.MipLevelsCount == StateTransitionDesc::RemainingMipLevels || Barrier.MipLevelsCount == TexDesc.MipLevels) && - Barrier.FirstArraySlice == 0 && (Barrier.ArraySliceCount == StateTransitionDesc::RemainingArraySlices || Barrier.ArraySliceCount == TexDesc.ArraySize)) + if (Barrier.FirstMipLevel == 0 && (Barrier.MipLevelsCount == REMAINING_MIP_LEVELS || Barrier.MipLevelsCount == TexDesc.MipLevels) && + Barrier.FirstArraySlice == 0 && (Barrier.ArraySliceCount == REMAINING_ARRAY_SLICES || Barrier.ArraySliceCount == TexDesc.ArraySize)) { BarrierDesc.Transition.Subresource = D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES; m_PendingResourceBarriers.emplace_back(BarrierDesc); } else { - Uint32 EndMip = Barrier.MipLevelsCount == StateTransitionDesc::RemainingMipLevels ? TexDesc.MipLevels : Barrier.FirstMipLevel + Barrier.MipLevelsCount; - Uint32 EndSlice = Barrier.ArraySliceCount == StateTransitionDesc::RemainingArraySlices ? TexDesc.ArraySize : Barrier.FirstArraySlice + Barrier.ArraySliceCount; + Uint32 EndMip = Barrier.MipLevelsCount == REMAINING_MIP_LEVELS ? TexDesc.MipLevels : Barrier.FirstMipLevel + Barrier.MipLevelsCount; + Uint32 EndSlice = Barrier.ArraySliceCount == REMAINING_ARRAY_SLICES ? TexDesc.ArraySize : Barrier.FirstArraySlice + Barrier.ArraySliceCount; for (Uint32 mip = Barrier.FirstMipLevel; mip < EndMip; ++mip) { for (Uint32 slice = Barrier.FirstArraySlice; slice < EndSlice; ++slice) diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp index 617c492e..51d4c945 100644 --- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp @@ -346,8 +346,8 @@ void DeviceContextD3D12Impl::CommitD3D12IndexBuffer(GraphicsContext& GraphCtx, V void DeviceContextD3D12Impl::CommitD3D12VertexBuffers(GraphicsContext& GraphCtx) { // Do not initialize array with zeroes for performance reasons - D3D12_VERTEX_BUFFER_VIEW VBViews[MaxBufferSlots]; // = {} - VERIFY(m_NumVertexStreams <= MaxBufferSlots, "Too many buffers are being set"); + D3D12_VERTEX_BUFFER_VIEW VBViews[MAX_BUFFER_SLOTS]; // = {} + VERIFY(m_NumVertexStreams <= MAX_BUFFER_SLOTS, "Too many buffers are being set"); DEV_CHECK_ERR(m_NumVertexStreams >= m_pPipelineState->GetNumBufferSlotsUsed(), "Currently bound pipeline state '", m_pPipelineState->GetDesc().Name, "' expects ", m_pPipelineState->GetNumBufferSlotsUsed(), " input buffer slots, but only ", m_NumVertexStreams, " is bound"); bool DynamicBufferPresent = false; for (UINT Buff = 0; Buff < m_NumVertexStreams; ++Buff) @@ -803,8 +803,8 @@ void DeviceContextD3D12Impl::SetIndexBuffer(IBuffer* pIndexBuffer, Uint32 ByteOf void DeviceContextD3D12Impl::CommitViewports() { - static_assert(MaxViewports >= D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "MaxViewports constant must be greater than D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE"); - D3D12_VIEWPORT d3d12Viewports[MaxViewports]; // Do not waste time initializing array to zero + static_assert(MAX_VIEWPORTS >= D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "MaxViewports constant must be greater than D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE"); + D3D12_VIEWPORT d3d12Viewports[MAX_VIEWPORTS]; // Do not waste time initializing array to zero for (Uint32 vp = 0; vp < m_NumViewports; ++vp) { @@ -822,7 +822,7 @@ void DeviceContextD3D12Impl::CommitViewports() void DeviceContextD3D12Impl::SetViewports(Uint32 NumViewports, const Viewport* pViewports, Uint32 RTWidth, Uint32 RTHeight) { - static_assert(MaxViewports >= D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "MaxViewports constant must be greater than D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE"); + static_assert(MAX_VIEWPORTS >= D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE, "MaxViewports constant must be greater than D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE"); TDeviceContextBase::SetViewports(NumViewports, pViewports, RTWidth, RTHeight); VERIFY(NumViewports == m_NumViewports, "Unexpected number of viewports"); diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp index 904fed65..5b7a555e 100644 --- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp +++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp @@ -53,7 +53,7 @@ namespace Diligent { /// Engine factory for D3D12 implementation -class EngineFactoryD3D12Impl : public EngineFactoryD3DBase<IEngineFactoryD3D12, DeviceType::D3D12> +class EngineFactoryD3D12Impl : public EngineFactoryD3DBase<IEngineFactoryD3D12, RENDER_DEVICE_TYPE_D3D12> { public: static EngineFactoryD3D12Impl* GetInstance() @@ -62,7 +62,7 @@ public: return &TheFactory; } - using TBase = EngineFactoryD3DBase<IEngineFactoryD3D12, DeviceType::D3D12>; + using TBase = EngineFactoryD3DBase<IEngineFactoryD3D12, RENDER_DEVICE_TYPE_D3D12>; EngineFactoryD3D12Impl() : TBase{IID_EngineFactoryD3D12} @@ -235,7 +235,7 @@ void EngineFactoryD3D12Impl::CreateDeviceAndContextsD3D12(const EngineD3D12Creat const auto MinimumFeatureLevel = EngineCI.MinimumFeatureLevel >= DIRECT3D_FEATURE_LEVEL_11_0 ? EngineCI.MinimumFeatureLevel : DIRECT3D_FEATURE_LEVEL_11_0; CComPtr<IDXGIAdapter1> hardwareAdapter; - if (EngineCI.AdapterId == EngineD3D12CreateInfo::DefaultAdapterId) + if (EngineCI.AdapterId == DEFAULT_ADAPTER_ID) { GetHardwareAdapter(factory, &hardwareAdapter, GetD3DFeatureLevel(MinimumFeatureLevel)); if (hardwareAdapter == nullptr) diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp index 797f7185..5d3c022b 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp @@ -93,7 +93,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCoun #ifdef DEVELOPMENT { - const ShaderResources* pResources[MaxShadersInPipeline] = {}; + const ShaderResources* pResources[MAX_SHADERS_IN_PIPELINE] = {}; for (Uint32 s = 0; s < m_NumShaders; ++s) { const auto* pShader = GetShader<const ShaderD3D12Impl>(s); @@ -283,7 +283,7 @@ PipelineStateD3D12Impl::PipelineStateD3D12Impl(IReferenceCounters* pRefCoun if (PipelineDesc.SRBAllocationGranularity > 1) { - std::array<size_t, MaxShadersInPipeline> ShaderVarMgrDataSizes = {}; + std::array<size_t, MAX_SHADERS_IN_PIPELINE> ShaderVarMgrDataSizes = {}; for (Uint32 s = 0; s < m_NumShaders; ++s) { std::array<SHADER_RESOURCE_VARIABLE_TYPE, 2> AllowedVarTypes = diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp index 1a96690e..4b1474d7 100644 --- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp @@ -133,7 +133,7 @@ RenderDeviceD3D12Impl::RenderDeviceD3D12Impl(IReferenceCounters* pRefCo m_QueryMgr {pd3d12Device, EngineCI.QueryPoolSizes} // clang-format on { - m_DeviceCaps.DevType = DeviceType::D3D12; + m_DeviceCaps.DevType = RENDER_DEVICE_TYPE_D3D12; auto FeatureLevel = GetD3DFeatureLevel(); switch (FeatureLevel) { diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp index fad13e73..89850809 100644 --- a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp @@ -36,7 +36,7 @@ namespace Diligent { -static const std::string GetD3D12ShaderModel(RenderDeviceD3D12Impl* /*pDevice*/, const ShaderCreateInfo::ShaderVersion& HLSLVersion) +static const std::string GetD3D12ShaderModel(RenderDeviceD3D12Impl* /*pDevice*/, const ShaderVersion& HLSLVersion) { if (HLSLVersion.Major == 0 && HLSLVersion.Minor == 0) { |