summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsTools
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-03-18 16:35:22 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-03-18 16:35:22 +0000
commit8356e8a99fbb4eda182e838e202c11530ed81403 (patch)
treed15c365da03ab64b1776dea43d1e2b754d03365b /Graphics/GraphicsTools
parentMerge from master (diff)
downloadDiligentCore-8356e8a99fbb4eda182e838e202c11530ed81403.tar.gz
DiligentCore-8356e8a99fbb4eda182e838e202c11530ed81403.zip
Renamed USAGE_CPU_ACCESSIBLE to USAGE_STAGING
Diffstat (limited to 'Graphics/GraphicsTools')
-rw-r--r--Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp4
-rw-r--r--Graphics/GraphicsTools/src/TextureUploaderGL.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp b/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
index 8eff3ae2..71f612cb 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderD3D12.cpp
@@ -227,9 +227,9 @@ namespace Diligent
if(*ppBuffer == nullptr)
{
BufferDesc BuffDesc;
- BuffDesc.Name = "Staging buffer for UploadBufferD3D12";
+ BuffDesc.Name = "Staging buffer for UploadBufferD3D12";
BuffDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
- BuffDesc.Usage = USAGE_CPU_ACCESSIBLE;
+ BuffDesc.Usage = USAGE_STAGING;
const auto &TexFmtInfo = m_pDevice->GetTextureFormatInfo(Desc.Format);
Uint32 RowStride = Desc.Width * Uint32{TexFmtInfo.ComponentSize} * Uint32{TexFmtInfo.NumComponents};
diff --git a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
index c820d186..fa954d93 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderGL.cpp
@@ -175,9 +175,9 @@ namespace Diligent
{
const auto &Desc = pBuffer->GetDesc();
BufferDesc BuffDesc;
- BuffDesc.Name = "Staging buffer for UploadBufferGL";
+ BuffDesc.Name = "Staging buffer for UploadBufferGL";
BuffDesc.CPUAccessFlags = CPU_ACCESS_WRITE;
- BuffDesc.Usage = USAGE_CPU_ACCESSIBLE;
+ BuffDesc.Usage = USAGE_STAGING;
const auto &TexFmtInfo = m_pDevice->GetTextureFormatInfo(Desc.Format);
RowStride = Desc.Width * Uint32{TexFmtInfo.ComponentSize} * Uint32{TexFmtInfo.NumComponents};