From 287a51c6e799b6c3e85bee2bf24fb91f340df6a9 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 7 Oct 2019 20:21:52 -0700 Subject: D3D11 backend: cosmetic code changes --- .../include/ShaderResourceCacheD3D11.h | 4 ++-- .../include/ShaderResourceLayoutD3D11.h | 2 +- Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp | 18 ++++++++++++++++-- .../GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp | 11 +++++++++-- .../GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp | 4 ++-- .../GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp | 13 +++++++++---- Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp | 2 +- .../GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp | 11 ++++++++--- .../GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp | 4 ++-- Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp | 7 ++++++- Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp | 9 +++++++-- .../src/ShaderResourceBindingD3D11Impl.cpp | 9 +++++++-- .../src/ShaderResourceLayoutD3D11.cpp | 6 +++--- .../GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp | 2 +- .../GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp | 12 ++++++++++-- Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp | 9 ++++++++- Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp | 18 ++++++++++++++++-- Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp | 18 ++++++++++++++++-- Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp | 8 +++++++- .../GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp | 11 +++++++++-- 20 files changed, 140 insertions(+), 38 deletions(-) (limited to 'Graphics/GraphicsEngineD3D11') diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.h b/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.h index 40b0cd76..ef197549 100755 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceCacheD3D11.h @@ -92,8 +92,8 @@ public: BufferD3D11Impl* pBuffer; // There is no need to keep strong reference to D3D11 resource as // it is already kept by either pTexture or pBuffer - ID3D11Resource *pd3d11Resource; - CachedResource()noexcept : pTexture(nullptr), pBuffer(nullptr), pd3d11Resource(nullptr) + ID3D11Resource* pd3d11Resource; + CachedResource()noexcept : pTexture{nullptr}, pBuffer{nullptr}, pd3d11Resource{nullptr} {} __forceinline void Set(RefCntAutoPtr&& pTexView) diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.h b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.h index beb4357d..5934e4c3 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.h +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.h @@ -45,7 +45,7 @@ class IMemoryAllocator; class ShaderResourceLayoutD3D11 { public: - ShaderResourceLayoutD3D11(IObject& Owner, + ShaderResourceLayoutD3D11(IObject& Owner, std::shared_ptr pSrcResources, const PipelineResourceLayoutDesc& ResourceLayout, const SHADER_RESOURCE_VARIABLE_TYPE* VarTypes, diff --git a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp index b18247cb..9ef2c373 100644 --- a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp @@ -40,7 +40,14 @@ BufferD3D11Impl :: BufferD3D11Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const BufferDesc& BuffDesc, const BufferData* pBuffData /*= nullptr*/) : - TBufferBase(pRefCounters, BuffViewObjMemAllocator, pRenderDeviceD3D11, BuffDesc, false) + TBufferBase + { + pRefCounters, + BuffViewObjMemAllocator, + pRenderDeviceD3D11, + BuffDesc, + false + } { #define LOG_BUFFER_ERROR_AND_THROW(...) LOG_ERROR_AND_THROW("Buffer \"", m_Desc.Name ? m_Desc.Name : "", "\": ", ##__VA_ARGS__); @@ -166,7 +173,14 @@ BufferD3D11Impl :: BufferD3D11Impl(IReferenceCounters* pRefCounters, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, ID3D11Buffer* pd3d11Buffer) : - TBufferBase(pRefCounters, BuffViewObjMemAllocator, pDeviceD3D11, BuffDescFromD3D11Buffer(pd3d11Buffer, BuffDesc), false) + TBufferBase + { + pRefCounters, + BuffViewObjMemAllocator, + pDeviceD3D11, + BuffDescFromD3D11Buffer(pd3d11Buffer, BuffDesc), + false + } { m_pd3d11Buffer = pd3d11Buffer; SetState(InitialState); diff --git a/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp index 63c69ef9..daf5779d 100644 --- a/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/BufferViewD3D11Impl.cpp @@ -33,8 +33,15 @@ BufferViewD3D11Impl::BufferViewD3D11Impl( IReferenceCounters* pRefCounters, IBuffer* pBuffer, ID3D11View* pD3D11View, bool bIsDefaultView ) : - TBufferViewBase( pRefCounters, pDevice, ViewDesc, pBuffer, bIsDefaultView ), - m_pD3D11View( pD3D11View ) + TBufferViewBase + { + pRefCounters, + pDevice, + ViewDesc, + pBuffer, + bIsDefaultView + }, + m_pD3D11View{pD3D11View} { if (*m_Desc.Name != 0) { diff --git a/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp index 3f6b00df..2c139ca0 100644 --- a/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/CommandListD3D11Impl.cpp @@ -33,8 +33,8 @@ namespace Diligent CommandListD3D11Impl :: CommandListD3D11Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pDevice, ID3D11CommandList* pd3d11CommandList) : - TCommandListBase(pRefCounters, pDevice), - m_pd3d11CommandList(pd3d11CommandList) + TCommandListBase{pRefCounters, pDevice}, + m_pd3d11CommandList{pd3d11CommandList} { } diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp index ce405784..1d5ce3d8 100755 --- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp @@ -47,10 +47,15 @@ namespace Diligent ID3D11DeviceContext* pd3d11DeviceContext, const struct EngineD3D11CreateInfo& EngineAttribs, bool bIsDeferred ) : - TDeviceContextBase(pRefCounters, pDevice, bIsDeferred), - m_pd3d11DeviceContext( pd3d11DeviceContext ), - m_DebugFlags(EngineAttribs.DebugFlags), - m_CmdListAllocator(GetRawAllocator(), sizeof(CommandListD3D11Impl), 64) + TDeviceContextBase + { + pRefCounters, + pDevice, + bIsDeferred + }, + m_pd3d11DeviceContext{pd3d11DeviceContext }, + m_DebugFlags {EngineAttribs.DebugFlags }, + m_CmdListAllocator {GetRawAllocator(), sizeof(CommandListD3D11Impl), 64} { } diff --git a/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp index cfeaa700..f63185f5 100644 --- a/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/FenceD3D11Impl.cpp @@ -33,7 +33,7 @@ namespace Diligent FenceD3D11Impl :: FenceD3D11Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pDevice, const FenceDesc& Desc) : - TFenceBase(pRefCounters, pDevice, Desc) + TFenceBase{pRefCounters, pDevice, Desc} { } diff --git a/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp index 25e45808..52d6b5a1 100644 --- a/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/PipelineStateD3D11Impl.cpp @@ -35,9 +35,14 @@ namespace Diligent PipelineStateD3D11Impl::PipelineStateD3D11Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const PipelineStateDesc& PipelineDesc) : - TPipelineStateBase(pRefCounters, pRenderDeviceD3D11, PipelineDesc), - m_SRBMemAllocator(GetRawAllocator()), - m_StaticSamplers(STD_ALLOCATOR_RAW_MEM(StaticSamplerInfo, GetRawAllocator(), "Allocator for vector")) + TPipelineStateBase + { + pRefCounters, + pRenderDeviceD3D11, + PipelineDesc + }, + m_SRBMemAllocator{GetRawAllocator()}, + m_StaticSamplers {STD_ALLOCATOR_RAW_MEM(StaticSamplerInfo, GetRawAllocator(), "Allocator for vector")} { if (PipelineDesc.IsComputePipeline) { diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp index b960a276..f04162c5 100644 --- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp @@ -65,8 +65,8 @@ RenderDeviceD3D11Impl :: RenderDeviceD3D11Impl(IReferenceCounters* pRef sizeof(FenceD3D11Impl) } }, - m_EngineAttribs(EngineAttribs), - m_pd3d11Device(pd3d11Device) + m_EngineAttribs{EngineAttribs}, + m_pd3d11Device {pd3d11Device } { m_DeviceCaps.DevType = DeviceType::D3D11; m_DeviceCaps.MajorVersion = 11; diff --git a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp index 5081df80..ee727278 100644 --- a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp @@ -32,7 +32,12 @@ namespace Diligent SamplerD3D11Impl::SamplerD3D11Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const SamplerDesc& SamplerDesc) : - TSamplerBase(pRefCounters, pRenderDeviceD3D11, SamplerDesc) + TSamplerBase + { + pRefCounters, + pRenderDeviceD3D11, + SamplerDesc + } { auto *pd3d11Device = pRenderDeviceD3D11->GetD3D11Device(); D3D11_SAMPLER_DESC D3D11SamplerDesc = diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp index df28d9ad..9454cf21 100644 --- a/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderD3D11Impl.cpp @@ -33,8 +33,13 @@ namespace Diligent ShaderD3D11Impl::ShaderD3D11Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const ShaderCreateInfo& ShaderCI) : - TShaderBase(pRefCounters, pRenderDeviceD3D11, ShaderCI.Desc), - ShaderD3DBase(ShaderCI) + TShaderBase + { + pRefCounters, + pRenderDeviceD3D11, + ShaderCI.Desc + }, + ShaderD3DBase{ShaderCI} { auto *pDeviceD3D11 = pRenderDeviceD3D11->GetD3D11Device(); switch (ShaderCI.Desc.ShaderType) diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp index dbbcf73b..a29b4864 100644 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp @@ -34,8 +34,13 @@ namespace Diligent ShaderResourceBindingD3D11Impl::ShaderResourceBindingD3D11Impl( IReferenceCounters* pRefCounters, PipelineStateD3D11Impl* pPSO, bool IsInternal) : - TBase( pRefCounters, pPSO, IsInternal ), - m_bIsStaticResourcesBound(false) + TBase + { + pRefCounters, + pPSO, + IsInternal + }, + m_bIsStaticResourcesBound{false} { m_NumActiveShaders = static_cast(pPSO->GetNumShaders()); diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp index c7ac7af2..0a825991 100755 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceLayoutD3D11.cpp @@ -101,9 +101,9 @@ ShaderResourceLayoutD3D11::ShaderResourceLayoutD3D11(IObject& ShaderResourceCacheD3D11& ResourceCache, IMemoryAllocator& ResCacheDataAllocator, IMemoryAllocator& ResLayoutDataAllocator) : - m_Owner (Owner), - m_pResources (std::move(pSrcResources)), - m_ResourceCache (ResourceCache) + m_Owner {Owner}, + m_pResources {std::move(pSrcResources)}, + m_ResourceCache {ResourceCache} { // http://diligentgraphics.com/diligent-engine/architecture/d3d11/shader-resource-layout#Shader-Resource-Layout-Initialization diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp index b5cacb46..7bc7d4bb 100755 --- a/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp @@ -37,7 +37,7 @@ ShaderResourcesD3D11::ShaderResourcesD3D11(RenderDeviceD3D11Impl* pDeviceD3D11Im ID3DBlob* pShaderBytecode, const ShaderDesc& ShdrDesc, const char* CombinedSamplerSuffix) : - ShaderResources(ShdrDesc.ShaderType) + ShaderResources{ShdrDesc.ShaderType} { class NewResourceHandler { diff --git a/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp index 3bc16bd0..0700cebf 100644 --- a/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/SwapChainD3D11Impl.cpp @@ -36,9 +36,17 @@ SwapChainD3D11Impl::SwapChainD3D11Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, DeviceContextD3D11Impl* pDeviceContextD3D11, void* pNativeWndHandle) : - TSwapChainBase(pRefCounters, pRenderDeviceD3D11, pDeviceContextD3D11, SCDesc, FSDesc, pNativeWndHandle) + TSwapChainBase + { + pRefCounters, + pRenderDeviceD3D11, + pDeviceContextD3D11, + SCDesc, + FSDesc, + pNativeWndHandle + } { - auto *pd3d11Device = pRenderDeviceD3D11->GetD3D11Device(); + auto* pd3d11Device = pRenderDeviceD3D11->GetD3D11Device(); CreateDXGISwapChain(pd3d11Device); CreateRTVandDSV(); } diff --git a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp index 7e3370f2..63c64240 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp @@ -34,7 +34,14 @@ Texture1D_D3D11 :: Texture1D_D3D11(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const TextureDesc& TexDesc, const TextureData* pInitData /*= nullptr*/) : - TextureBaseD3D11(pRefCounters, TexViewObjAllocator, pRenderDeviceD3D11, TexDesc, pInitData) + TextureBaseD3D11 + { + pRefCounters, + TexViewObjAllocator, + pRenderDeviceD3D11, + TexDesc, + pInitData + } { auto D3D11TexFormat = TexFormatToDXGI_Format(m_Desc.Format, m_Desc.BindFlags); auto D3D11BindFlags = BindFlagsToD3D11BindFlags(m_Desc.BindFlags); diff --git a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp index 7600d942..072af44f 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp @@ -34,7 +34,14 @@ Texture2D_D3D11 :: Texture2D_D3D11(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const TextureDesc& TexDesc, const TextureData* pInitData /*= nullptr*/) : - TextureBaseD3D11(pRefCounters, TexViewObjAllocator, pRenderDeviceD3D11, TexDesc, pInitData) + TextureBaseD3D11 + { + pRefCounters, + TexViewObjAllocator, + pRenderDeviceD3D11, + TexDesc, + pInitData + } { auto D3D11TexFormat = TexFormatToDXGI_Format(m_Desc.Format, m_Desc.BindFlags); auto D3D11BindFlags = BindFlagsToD3D11BindFlags(m_Desc.BindFlags); @@ -127,7 +134,14 @@ Texture2D_D3D11 :: Texture2D_D3D11(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pDeviceD3D11, RESOURCE_STATE InitialState, ID3D11Texture2D* pd3d11Texture) : - TextureBaseD3D11(pRefCounters, TexViewObjAllocator, pDeviceD3D11, TexDescFromD3D11Texture2D{}(pd3d11Texture), nullptr) + TextureBaseD3D11 + { + pRefCounters, + TexViewObjAllocator, + pDeviceD3D11, + TexDescFromD3D11Texture2D{}(pd3d11Texture), + nullptr + } { m_pd3d11Texture = pd3d11Texture; SetState(InitialState); diff --git a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp index d9a8e5ef..8b9153c3 100644 --- a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp @@ -34,7 +34,14 @@ Texture3D_D3D11 :: Texture3D_D3D11(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const TextureDesc& TexDesc, const TextureData* pInitData /*= nullptr*/) : - TextureBaseD3D11(pRefCounters, TexViewObjAllocator, pRenderDeviceD3D11, TexDesc, pInitData) + TextureBaseD3D11 + { + pRefCounters, + TexViewObjAllocator, + pRenderDeviceD3D11, + TexDesc, + pInitData + } { auto D3D11TexFormat = TexFormatToDXGI_Format(m_Desc.Format, m_Desc.BindFlags); auto D3D11BindFlags = BindFlagsToD3D11BindFlags(m_Desc.BindFlags); @@ -119,7 +126,14 @@ Texture3D_D3D11 :: Texture3D_D3D11(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pDeviceD3D11, RESOURCE_STATE InitialState, ID3D11Texture3D* pd3d11Texture) : - TextureBaseD3D11(pRefCounters, TexViewObjAllocator, pDeviceD3D11, TexDescFromD3D11Texture3D{}(pd3d11Texture), nullptr) + TextureBaseD3D11 + { + pRefCounters, + TexViewObjAllocator, + pDeviceD3D11, + TexDescFromD3D11Texture3D{}(pd3d11Texture), + nullptr + } { m_pd3d11Texture = pd3d11Texture; SetState(InitialState); diff --git a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp index 2abffad5..b35132aa 100644 --- a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp @@ -37,7 +37,13 @@ TextureBaseD3D11 :: TextureBaseD3D11(IReferenceCounters* pRefCounters, RenderDeviceD3D11Impl* pRenderDeviceD3D11, const TextureDesc& TexDesc, const TextureData* pInitData /*= nullptr*/) : - TTextureBase(pRefCounters, TexViewObjAllocator, pRenderDeviceD3D11, TexDesc) + TTextureBase + { + pRefCounters, + TexViewObjAllocator, + pRenderDeviceD3D11, + TexDesc + } { if (m_Desc.Usage == USAGE_STATIC && (pInitData == nullptr || pInitData->pSubResources == nullptr)) LOG_ERROR_AND_THROW("Static textures must be initialized with data at creation time: pInitData can't be null"); diff --git a/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp index d07e6b63..362ed080 100644 --- a/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp +++ b/Graphics/GraphicsEngineD3D11/src/TextureViewD3D11Impl.cpp @@ -34,8 +34,15 @@ TextureViewD3D11Impl::TextureViewD3D11Impl( IReferenceCounters* pRefCounters, ITexture* pTexture, ID3D11View* pD3D11View, bool bIsDefaultView ) : - TTextureViewBase( pRefCounters, pDevice, ViewDesc, pTexture, bIsDefaultView ), - m_pD3D11View( pD3D11View ) + TTextureViewBase + { + pRefCounters, + pDevice, + ViewDesc, + pTexture, + bIsDefaultView + }, + m_pD3D11View{pD3D11View} { if (*m_Desc.Name != 0) { -- cgit v1.2.3