summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsTools
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-02-09 01:28:02 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-02-09 01:28:02 +0000
commit26a81f5d5aef3e8d367c7e91870becce7c21e1f9 (patch)
tree47a80be0a9f5d26ac632785825aa0b6dc524a6a6 /Graphics/GraphicsTools
parentDefined constructos to fix build errors on Apple's clang (diff)
downloadDiligentCore-26a81f5d5aef3e8d367c7e91870becce7c21e1f9.tar.gz
DiligentCore-26a81f5d5aef3e8d367c7e91870becce7c21e1f9.zip
Updated IRenderDevice::CreateTexture and IRenderDevice::CreateBuffer to take pointers to initial data rather than references
Diffstat (limited to 'Graphics/GraphicsTools')
-rw-r--r--Graphics/GraphicsTools/include/CommonlyUsedStates.h6
-rw-r--r--Graphics/GraphicsTools/src/GraphicsUtilities.cpp2
-rw-r--r--Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp2
-rw-r--r--Graphics/GraphicsTools/src/TextureUploaderGL.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/Graphics/GraphicsTools/include/CommonlyUsedStates.h b/Graphics/GraphicsTools/include/CommonlyUsedStates.h
index 6257b3c2..b97553d3 100644
--- a/Graphics/GraphicsTools/include/CommonlyUsedStates.h
+++ b/Graphics/GraphicsTools/include/CommonlyUsedStates.h
@@ -65,9 +65,9 @@ namespace Diligent
static const BlendStateDesc BS_AlphaBlend =
{
- False, // AlphaToCoverageEnable
- False, // IndependentBlendEnable
- RenderTargetBlendDesc// RT0
+ False, // AlphaToCoverageEnable
+ False, // IndependentBlendEnable
+ RenderTargetBlendDesc // Render Target 0
{
True, // BlendEnable
False, // LogicOperationEnable
diff --git a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
index c203a7a3..29837ec3 100644
--- a/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
+++ b/Graphics/GraphicsTools/src/GraphicsUtilities.cpp
@@ -41,7 +41,7 @@ void CreateUniformBuffer( IRenderDevice *pDevice, Uint32 Size, const Char *Name,
CBDesc.Usage = Usage;
CBDesc.BindFlags = BindFlags;
CBDesc.CPUAccessFlags = CPUAccessFlags;
- pDevice->CreateBuffer( CBDesc, BufferData(), ppBuffer );
+ pDevice->CreateBuffer( CBDesc, nullptr, ppBuffer );
}
template<class TConverter>
diff --git a/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp b/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
index 0905033e..8eff3ae2 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
@@ -239,7 +239,7 @@ namespace Diligent
BuffDesc.uiSizeInBytes = Desc.Height * RowStride;
RefCntAutoPtr<IBuffer> pStagingBuffer;
- m_pDevice->CreateBuffer(BuffDesc, BufferData(), &pStagingBuffer);
+ m_pDevice->CreateBuffer(BuffDesc, nullptr, &pStagingBuffer);
PVoid CpuVirtualAddress = nullptr;
RefCntAutoPtr<IBufferD3D12> pStagingBufferD3D12(pStagingBuffer, IID_BufferD3D12);
diff --git a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
index 06c5dfc7..c820d186 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
@@ -187,7 +187,7 @@ namespace Diligent
BuffDesc.uiSizeInBytes = Desc.Height * RowStride;
RefCntAutoPtr<IBuffer> pStagingBuffer;
- m_pDevice->CreateBuffer(BuffDesc, BufferData(), &pBuffer->m_pStagingBuffer);
+ m_pDevice->CreateBuffer(BuffDesc, nullptr, &pBuffer->m_pStagingBuffer);
}
PVoid CpuAddress = nullptr;