summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3D11
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2019-12-25 02:03:09 +0000
committerassiduous <assiduous@diligentgraphics.com>2019-12-25 02:03:09 +0000
commitd94d8e0cc5e5c3bc12da4216209982a636f03144 (patch)
tree57f4136cd3fdf62cbd601c4599279cdcdd1b97f0 /Graphics/GraphicsEngineD3D11
parentAdded SetSwapChain method to IDeviceContextGL interface (diff)
downloadDiligentCore-d94d8e0cc5e5c3bc12da4216209982a636f03144.tar.gz
DiligentCore-d94d8e0cc5e5c3bc12da4216209982a636f03144.zip
Minor formatting updates
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
-rw-r--r--Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp24
-rw-r--r--Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp22
-rw-r--r--Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp22
-rw-r--r--Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp22
-rw-r--r--Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp22
-rw-r--r--Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp18
6 files changed, 65 insertions, 65 deletions
diff --git a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp
index e7da925a..ee2c1b8e 100644
--- a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp
@@ -35,11 +35,11 @@
namespace Diligent
{
-BufferD3D11Impl ::BufferD3D11Impl(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& BuffViewObjMemAllocator,
- RenderDeviceD3D11Impl* pRenderDeviceD3D11,
- const BufferDesc& BuffDesc,
- const BufferData* pBuffData /*= nullptr*/) :
+BufferD3D11Impl::BufferD3D11Impl(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& BuffViewObjMemAllocator,
+ RenderDeviceD3D11Impl* pRenderDeviceD3D11,
+ const BufferDesc& BuffDesc,
+ const BufferData* pBuffData /*= nullptr*/) :
// clang-format off
TBufferBase
{
@@ -182,12 +182,12 @@ static BufferDesc BuffDescFromD3D11Buffer(ID3D11Buffer* pd3d11Buffer, BufferDesc
return BuffDesc;
}
-BufferD3D11Impl ::BufferD3D11Impl(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& BuffViewObjMemAllocator,
- class RenderDeviceD3D11Impl* pDeviceD3D11,
- const BufferDesc& BuffDesc,
- RESOURCE_STATE InitialState,
- ID3D11Buffer* pd3d11Buffer) :
+BufferD3D11Impl::BufferD3D11Impl(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& BuffViewObjMemAllocator,
+ class RenderDeviceD3D11Impl* pDeviceD3D11,
+ const BufferDesc& BuffDesc,
+ RESOURCE_STATE InitialState,
+ ID3D11Buffer* pd3d11Buffer) :
// clang-format off
TBufferBase
{
@@ -203,7 +203,7 @@ BufferD3D11Impl ::BufferD3D11Impl(IReferenceCounters* pRefCounters,
SetState(InitialState);
}
-BufferD3D11Impl ::~BufferD3D11Impl()
+BufferD3D11Impl::~BufferD3D11Impl()
{
}
diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp
index 3f7e4fea..d54b82e7 100644
--- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp
@@ -40,12 +40,12 @@
namespace Diligent
{
-RenderDeviceD3D11Impl ::RenderDeviceD3D11Impl(IReferenceCounters* pRefCounters,
- IMemoryAllocator& RawMemAllocator,
- IEngineFactory* pEngineFactory,
- const EngineD3D11CreateInfo& EngineAttribs,
- ID3D11Device* pd3d11Device,
- Uint32 NumDeferredContexts) :
+RenderDeviceD3D11Impl::RenderDeviceD3D11Impl(IReferenceCounters* pRefCounters,
+ IMemoryAllocator& RawMemAllocator,
+ IEngineFactory* pEngineFactory,
+ const EngineD3D11CreateInfo& EngineAttribs,
+ ID3D11Device* pd3d11Device,
+ Uint32 NumDeferredContexts) :
// clang-format off
TRenderDeviceBase
{
@@ -135,7 +135,7 @@ void RenderDeviceD3D11Impl::TestTextureFormat(TEXTURE_FORMAT TexFormat)
IMPLEMENT_QUERY_INTERFACE(RenderDeviceD3D11Impl, IID_RenderDeviceD3D11, TRenderDeviceBase)
-void RenderDeviceD3D11Impl ::CreateBufferFromD3DResource(ID3D11Buffer* pd3d11Buffer, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer)
+void RenderDeviceD3D11Impl::CreateBufferFromD3DResource(ID3D11Buffer* pd3d11Buffer, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer)
{
CreateDeviceObject("buffer", BuffDesc, ppBuffer,
[&]() //
@@ -147,7 +147,7 @@ void RenderDeviceD3D11Impl ::CreateBufferFromD3DResource(ID3D11Buffer* pd3d11Buf
});
}
-void RenderDeviceD3D11Impl ::CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer)
+void RenderDeviceD3D11Impl::CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer)
{
CreateDeviceObject("buffer", BuffDesc, ppBuffer,
[&]() //
@@ -159,7 +159,7 @@ void RenderDeviceD3D11Impl ::CreateBuffer(const BufferDesc& BuffDesc, const Buff
});
}
-void RenderDeviceD3D11Impl ::CreateShader(const ShaderCreateInfo& ShaderCI, IShader** ppShader)
+void RenderDeviceD3D11Impl::CreateShader(const ShaderCreateInfo& ShaderCI, IShader** ppShader)
{
CreateDeviceObject("shader", ShaderCI.Desc, ppShader,
[&]() //
@@ -223,7 +223,7 @@ void RenderDeviceD3D11Impl::CreateTextureFromD3DResource(ID3D11Texture3D* pd3d11
}
-void RenderDeviceD3D11Impl ::CreateTexture(const TextureDesc& TexDesc, const TextureData* pData, ITexture** ppTexture)
+void RenderDeviceD3D11Impl::CreateTexture(const TextureDesc& TexDesc, const TextureData* pData, ITexture** ppTexture)
{
CreateDeviceObject("texture", TexDesc, ppTexture,
[&]() //
@@ -255,7 +255,7 @@ void RenderDeviceD3D11Impl ::CreateTexture(const TextureDesc& TexDesc, const Tex
});
}
-void RenderDeviceD3D11Impl ::CreateSampler(const SamplerDesc& SamplerDesc, ISampler** ppSampler)
+void RenderDeviceD3D11Impl::CreateSampler(const SamplerDesc& SamplerDesc, ISampler** ppSampler)
{
CreateDeviceObject("sampler", SamplerDesc, ppSampler,
[&]() //
diff --git a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp
index d8898956..b8a882db 100644
--- a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp
@@ -29,11 +29,11 @@
namespace Diligent
{
-Texture1D_D3D11 ::Texture1D_D3D11(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& TexViewObjAllocator,
- RenderDeviceD3D11Impl* pRenderDeviceD3D11,
- const TextureDesc& TexDesc,
- const TextureData* pInitData /*= nullptr*/) :
+Texture1D_D3D11::Texture1D_D3D11(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& TexViewObjAllocator,
+ RenderDeviceD3D11Impl* pRenderDeviceD3D11,
+ const TextureDesc& TexDesc,
+ const TextureData* pInitData /*= nullptr*/) :
// clang-format off
TextureBaseD3D11
{
@@ -126,18 +126,18 @@ private:
} // namespace
-Texture1D_D3D11 ::Texture1D_D3D11(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& TexViewObjAllocator,
- RenderDeviceD3D11Impl* pDeviceD3D11,
- RESOURCE_STATE InitialState,
- ID3D11Texture1D* pd3d11Texture) :
+Texture1D_D3D11::Texture1D_D3D11(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& TexViewObjAllocator,
+ RenderDeviceD3D11Impl* pDeviceD3D11,
+ RESOURCE_STATE InitialState,
+ ID3D11Texture1D* pd3d11Texture) :
TextureBaseD3D11{pRefCounters, TexViewObjAllocator, pDeviceD3D11, TexDescFromD3D11Texture1D{}(pd3d11Texture), nullptr}
{
m_pd3d11Texture = pd3d11Texture;
SetState(InitialState);
}
-Texture1D_D3D11 ::~Texture1D_D3D11()
+Texture1D_D3D11::~Texture1D_D3D11()
{
}
diff --git a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp
index e60ab2a2..f506bbf1 100644
--- a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp
@@ -29,11 +29,11 @@
namespace Diligent
{
-Texture2D_D3D11 ::Texture2D_D3D11(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& TexViewObjAllocator,
- RenderDeviceD3D11Impl* pRenderDeviceD3D11,
- const TextureDesc& TexDesc,
- const TextureData* pInitData /*= nullptr*/) :
+Texture2D_D3D11::Texture2D_D3D11(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& TexViewObjAllocator,
+ RenderDeviceD3D11Impl* pRenderDeviceD3D11,
+ const TextureDesc& TexDesc,
+ const TextureData* pInitData /*= nullptr*/) :
// clang-format off
TextureBaseD3D11
{
@@ -133,11 +133,11 @@ private:
} // namespace
-Texture2D_D3D11 ::Texture2D_D3D11(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& TexViewObjAllocator,
- RenderDeviceD3D11Impl* pDeviceD3D11,
- RESOURCE_STATE InitialState,
- ID3D11Texture2D* pd3d11Texture) :
+Texture2D_D3D11::Texture2D_D3D11(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& TexViewObjAllocator,
+ RenderDeviceD3D11Impl* pDeviceD3D11,
+ RESOURCE_STATE InitialState,
+ ID3D11Texture2D* pd3d11Texture) :
// clang-format off
TextureBaseD3D11
{
@@ -153,7 +153,7 @@ Texture2D_D3D11 ::Texture2D_D3D11(IReferenceCounters* pRefCounters,
SetState(InitialState);
}
-Texture2D_D3D11 ::~Texture2D_D3D11()
+Texture2D_D3D11::~Texture2D_D3D11()
{
}
diff --git a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp
index 65dbaf46..082b68cc 100644
--- a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp
@@ -29,11 +29,11 @@
namespace Diligent
{
-Texture3D_D3D11 ::Texture3D_D3D11(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& TexViewObjAllocator,
- RenderDeviceD3D11Impl* pRenderDeviceD3D11,
- const TextureDesc& TexDesc,
- const TextureData* pInitData /*= nullptr*/) :
+Texture3D_D3D11::Texture3D_D3D11(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& TexViewObjAllocator,
+ RenderDeviceD3D11Impl* pRenderDeviceD3D11,
+ const TextureDesc& TexDesc,
+ const TextureData* pInitData /*= nullptr*/) :
// clang-format off
TextureBaseD3D11
{
@@ -126,11 +126,11 @@ private:
} // namespace
-Texture3D_D3D11 ::Texture3D_D3D11(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& TexViewObjAllocator,
- RenderDeviceD3D11Impl* pDeviceD3D11,
- RESOURCE_STATE InitialState,
- ID3D11Texture3D* pd3d11Texture) :
+Texture3D_D3D11::Texture3D_D3D11(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& TexViewObjAllocator,
+ RenderDeviceD3D11Impl* pDeviceD3D11,
+ RESOURCE_STATE InitialState,
+ ID3D11Texture3D* pd3d11Texture) :
// clang-format off
TextureBaseD3D11
{
@@ -215,7 +215,7 @@ void Texture3D_D3D11::CreateUAV(TextureViewDesc& UAVDesc, ID3D11UnorderedAccessV
}
-Texture3D_D3D11 ::~Texture3D_D3D11()
+Texture3D_D3D11::~Texture3D_D3D11()
{
}
diff --git a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
index 3ffb65bd..a2ad41ab 100644
--- a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
@@ -32,11 +32,11 @@
namespace Diligent
{
-TextureBaseD3D11 ::TextureBaseD3D11(IReferenceCounters* pRefCounters,
- FixedBlockMemoryAllocator& TexViewObjAllocator,
- RenderDeviceD3D11Impl* pRenderDeviceD3D11,
- const TextureDesc& TexDesc,
- const TextureData* pInitData /*= nullptr*/) :
+TextureBaseD3D11::TextureBaseD3D11(IReferenceCounters* pRefCounters,
+ FixedBlockMemoryAllocator& TexViewObjAllocator,
+ RenderDeviceD3D11Impl* pRenderDeviceD3D11,
+ const TextureDesc& TexDesc,
+ const TextureData* pInitData /*= nullptr*/) :
// clang-format off
TTextureBase
{
@@ -129,9 +129,9 @@ void TextureBaseD3D11::CreateViewInternal(const struct TextureViewDesc& ViewDesc
}
}
-void TextureBaseD3D11 ::PrepareD3D11InitData(const TextureData* pInitData,
- Uint32 NumSubresources,
- std::vector<D3D11_SUBRESOURCE_DATA, STDAllocatorRawMem<D3D11_SUBRESOURCE_DATA>>& D3D11InitData)
+void TextureBaseD3D11::PrepareD3D11InitData(const TextureData* pInitData,
+ Uint32 NumSubresources,
+ std::vector<D3D11_SUBRESOURCE_DATA, STDAllocatorRawMem<D3D11_SUBRESOURCE_DATA>>& D3D11InitData)
{
if (pInitData != nullptr && pInitData->pSubResources != nullptr)
{
@@ -153,7 +153,7 @@ void TextureBaseD3D11 ::PrepareD3D11InitData(const TextureData*
}
}
-TextureBaseD3D11 ::~TextureBaseD3D11()
+TextureBaseD3D11::~TextureBaseD3D11()
{
}