Renamed USAGE_CPU_ACCESSIBLE to USAGE_STAGING

14 files changed, 45 insertions, 45 deletions

diff --git a/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp b/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp
index 1a6fe2e6..fb0be751 100644
--- a/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp
+++ b/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp
@@ -563,11 +563,11 @@ const Char* GetUsageString( USAGE Usage )
         INIT_USGAGE_STR( USAGE_STATIC );
         INIT_USGAGE_STR( USAGE_DEFAULT );
         INIT_USGAGE_STR( USAGE_DYNAMIC );
-        INIT_USGAGE_STR( USAGE_CPU_ACCESSIBLE );
+        INIT_USGAGE_STR( USAGE_STAGING );
 #undef  INIT_USGAGE_STR
         bUsageStringsInit = true;
     }
-    if( Usage >= USAGE_STATIC && Usage <= USAGE_CPU_ACCESSIBLE )
+    if( Usage >= USAGE_STATIC && Usage <= USAGE_STAGING )
         return UsageStrings[Usage];
     else
     {
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.h b/Graphics/GraphicsEngine/include/DeviceContextBase.h
index 15172c4c..b7287825 100644
--- a/Graphics/GraphicsEngine/include/DeviceContextBase.h
+++ b/Graphics/GraphicsEngine/include/DeviceContextBase.h
@@ -764,18 +764,18 @@ inline void DeviceContextBase<BaseInterface,ImplementationTraits> ::
     switch( MapType )
     {
     case MAP_READ:
-        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_CPU_ACCESSIBLE,      "Only buffers with usage USAGE_CPU_ACCESSIBLE can be read from" );
+        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_STAGING,      "Only buffers with usage USAGE_STAGING can be read from" );
         DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_READ), "Buffer being mapped for reading was not created with CPU_ACCESS_READ flag" );
         DEV_CHECK_ERR( (MapFlags & MAP_FLAG_DISCARD) == 0, "MAP_FLAG_DISCARD is not valid when mapping buffer for reading" );
         break;
 
     case MAP_WRITE:
-        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_CPU_ACCESSIBLE, "Only buffers with usage USAGE_CPU_ACCESSIBLE or USAGE_DYNAMIC can be mapped for writing" );
+        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_STAGING, "Only buffers with usage USAGE_STAGING or USAGE_DYNAMIC can be mapped for writing" );
         DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_WRITE), "Buffer being mapped for writing was not created with CPU_ACCESS_WRITE flag" );
         break;
 
     case MAP_READ_WRITE:
-        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_CPU_ACCESSIBLE,       "Only buffers with usage USAGE_CPU_ACCESSIBLE can be mapped for reading and writing" );
+        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_STAGING,       "Only buffers with usage USAGE_STAGING can be mapped for reading and writing" );
         DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_WRITE), "Buffer being mapped for reading & writing was not created with CPU_ACCESS_WRITE flag" );
         DEV_CHECK_ERR( (BuffDesc.CPUAccessFlags & CPU_ACCESS_READ),  "Buffer being mapped for reading & writing was not created with CPU_ACCESS_READ flag" );
         DEV_CHECK_ERR( (MapFlags & MAP_FLAG_DISCARD) == 0, "MAP_FLAG_DISCARD is not valid when mapping buffer for reading and writing" );
@@ -792,7 +792,7 @@ inline void DeviceContextBase<BaseInterface,ImplementationTraits> ::
 
     if ( (MapFlags & MAP_FLAG_DISCARD) != 0 )
     {
-        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_CPU_ACCESSIBLE, "Only dynamic and staging buffers can be mapped with discard flag" );
+        DEV_CHECK_ERR( BuffDesc.Usage == USAGE_DYNAMIC || BuffDesc.Usage == USAGE_STAGING, "Only dynamic and staging buffers can be mapped with discard flag" );
         DEV_CHECK_ERR( MapType == MAP_WRITE, "MAP_FLAG_DISCARD is only valid when mapping buffer for writing" );
     }
 }
diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
index e4ecbc6f..746f6a67 100644
--- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h
+++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
@@ -106,7 +106,7 @@ namespace Diligent
 
         /// A resource that facilitates transferring data from GPU to CPU. \n
         /// D3D11 Counterpart: D3D11_USAGE_STAGING. OpenGL counterpart: GL_DYNAMIC_READ
-        USAGE_CPU_ACCESSIBLE
+        USAGE_STAGING
     };
 
     /// Allowed CPU access mode flags when mapping a resource
diff --git a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h
index 3041c8f4..07b01298 100644
--- a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h
+++ b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h
@@ -70,10 +70,10 @@ inline D3D11_USAGE UsageToD3D11Usage(USAGE Usage)
 {
     switch(Usage)
     {
-        case USAGE_STATIC:         return D3D11_USAGE_IMMUTABLE;
-        case USAGE_DEFAULT:        return D3D11_USAGE_DEFAULT;
-        case USAGE_DYNAMIC:        return D3D11_USAGE_DYNAMIC;
-        case USAGE_CPU_ACCESSIBLE: return D3D11_USAGE_STAGING;
+        case USAGE_STATIC:      return D3D11_USAGE_IMMUTABLE;
+        case USAGE_DEFAULT:     return D3D11_USAGE_DEFAULT;
+        case USAGE_DYNAMIC:     return D3D11_USAGE_DYNAMIC;
+        case USAGE_STAGING:     return D3D11_USAGE_STAGING;
         default: UNEXPECTED("Unknow usage" ); return D3D11_USAGE_DEFAULT;
     }
 }
@@ -85,7 +85,7 @@ inline USAGE D3D11UsageToUsage(D3D11_USAGE D3D11Usage)
         case D3D11_USAGE_IMMUTABLE: return USAGE_STATIC;
         case D3D11_USAGE_DEFAULT:   return USAGE_DEFAULT;
         case D3D11_USAGE_DYNAMIC:   return USAGE_DYNAMIC;
-        case D3D11_USAGE_STAGING:   return USAGE_CPU_ACCESSIBLE;
+        case D3D11_USAGE_STAGING:   return USAGE_STAGING;
         default: UNEXPECTED("Unknow D3D11 usage" ); return USAGE_DEFAULT;
     }
 }
diff --git a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
index eaf96a64..4e32275a 100644
--- a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
@@ -67,7 +67,7 @@ BufferD3D12Impl :: BufferD3D12Impl(IReferenceCounters*          pRefCounters,
     if (m_Desc.BindFlags & BIND_UNIFORM_BUFFER)
         AlignmentMask = 255;
     
-    if (m_Desc.Usage == USAGE_CPU_ACCESSIBLE)
+    if (m_Desc.Usage == USAGE_STAGING)
     {
         if (m_Desc.CPUAccessFlags != CPU_ACCESS_WRITE && m_Desc.CPUAccessFlags != CPU_ACCESS_READ)
             LOG_BUFFER_ERROR_AND_THROW("Exactly one of the CPU_ACCESS_WRITE or CPU_ACCESS_READ flags must be specified for a cpu-accessible buffer")
@@ -117,7 +117,7 @@ BufferD3D12Impl :: BufferD3D12Impl(IReferenceCounters*          pRefCounters,
         auto *pd3d12Device = pRenderDeviceD3D12->GetD3D12Device();
 
         D3D12_HEAP_PROPERTIES HeapProps;
-        if (m_Desc.Usage == USAGE_CPU_ACCESSIBLE)
+        if (m_Desc.Usage == USAGE_STAGING)
             HeapProps.Type = m_Desc.CPUAccessFlags == CPU_ACCESS_READ ? D3D12_HEAP_TYPE_READBACK : D3D12_HEAP_TYPE_UPLOAD;
         else
             HeapProps.Type = D3D12_HEAP_TYPE_DEFAULT;
diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
index 353b9676..eba7ac5d 100644
--- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
@@ -941,7 +941,7 @@ namespace Diligent
             LOG_WARNING_MESSAGE_ONCE("Mapping CPU buffer for reading on D3D12 currently requires flushing context and idling GPU");
             Flush();
             m_pDevice.RawPtr<RenderDeviceD3D12Impl>()->IdleGPU();
-            VERIFY(BuffDesc.Usage == USAGE_CPU_ACCESSIBLE, "Buffer must be created as USAGE_CPU_ACCESSIBLE to be mapped for reading");
+            VERIFY(BuffDesc.Usage == USAGE_STAGING, "Buffer must be created as USAGE_STAGING to be mapped for reading");
             D3D12_RANGE MapRange;
             MapRange.Begin = 0;
             MapRange.End = BuffDesc.uiSizeInBytes;
@@ -949,9 +949,9 @@ namespace Diligent
         }
         else if(MapType == MAP_WRITE)
         {
-            if (BuffDesc.Usage == USAGE_CPU_ACCESSIBLE)
+            if (BuffDesc.Usage == USAGE_STAGING)
             {
-                VERIFY(pd3d12Resource != nullptr, "USAGE_CPU_ACCESSIBLE buffer mapped for writing must intialize D3D12 resource");
+                VERIFY(pd3d12Resource != nullptr, "USAGE_STAGING buffer mapped for writing must intialize D3D12 resource");
                 if (MapFlags & MAP_FLAG_DISCARD)
                 {
                 
@@ -976,7 +976,7 @@ namespace Diligent
             }
             else
             {
-                LOG_ERROR("Only USAGE_DYNAMIC and USAGE_CPU_ACCESSIBLE D3D12 buffers can be mapped for writing");
+                LOG_ERROR("Only USAGE_DYNAMIC and USAGE_STAGING D3D12 buffers can be mapped for writing");
             }
         }
         else if(MapType == MAP_READ_WRITE)
@@ -1005,9 +1005,9 @@ namespace Diligent
         }
         else if(MapType == MAP_WRITE)
         {
-            if (BuffDesc.Usage == USAGE_CPU_ACCESSIBLE)
+            if (BuffDesc.Usage == USAGE_STAGING)
             {
-                VERIFY(pd3d12Resource != nullptr, "USAGE_CPU_ACCESSIBLE buffer mapped for writing must intialize D3D12 resource");
+                VERIFY(pd3d12Resource != nullptr, "USAGE_STAGING buffer mapped for writing must intialize D3D12 resource");
                 pd3d12Resource->Unmap(0, nullptr);
             }
             else if (BuffDesc.Usage == USAGE_DYNAMIC)
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h b/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h
index f9cdb0c5..d7e7b55c 100644
--- a/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h
+++ b/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h
@@ -91,10 +91,10 @@ inline GLenum UsageToGLUsage(USAGE Usage)
     // http://www.informit.com/articles/article.aspx?p=2033340&seqNum=2
     switch(Usage)
     {
-        case USAGE_STATIC:       return GL_STATIC_DRAW;
-        case USAGE_DEFAULT:      return GL_DYNAMIC_DRAW;
-        case USAGE_DYNAMIC:      return GL_STREAM_DRAW;
-        case USAGE_CPU_ACCESSIBLE: return GL_DYNAMIC_READ;
+        case USAGE_STATIC:      return GL_STATIC_DRAW;
+        case USAGE_DEFAULT:     return GL_DYNAMIC_DRAW;
+        case USAGE_DYNAMIC:     return GL_STREAM_DRAW;
+        case USAGE_STAGING:     return GL_DYNAMIC_READ;
         default: UNEXPECTED( "Unknow usage" ); return 0;
     }
 }
diff --git a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp
index f0319479..5b23d346 100644
--- a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp
@@ -62,7 +62,7 @@ static GLenum GetBufferBindTarget(const BufferDesc& Desc)
 #endif
         Target = GL_DRAW_INDIRECT_BUFFER;
     }
-    else if (Desc.Usage == USAGE_CPU_ACCESSIBLE && Desc.CPUAccessFlags == CPU_ACCESS_WRITE)
+    else if (Desc.Usage == USAGE_STAGING && Desc.CPUAccessFlags == CPU_ACCESS_WRITE)
         Target = GL_PIXEL_UNPACK_BUFFER;
     
     return Target;
diff --git a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp
index d28cfb7a..c7967e8d 100644
--- a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp
@@ -52,7 +52,7 @@ BufferVkImpl :: BufferVkImpl(IReferenceCounters*        pRefCounters,
     if( m_Desc.Usage == USAGE_DYNAMIC && pBuffData != nullptr && pBuffData->pData != nullptr )
         LOG_BUFFER_ERROR_AND_THROW("Dynamic buffer must be initialized via Map()")
 
-    if (m_Desc.Usage == USAGE_CPU_ACCESSIBLE)
+    if (m_Desc.Usage == USAGE_STAGING)
     {
         if (m_Desc.CPUAccessFlags != CPU_ACCESS_WRITE && m_Desc.CPUAccessFlags != CPU_ACCESS_READ)
             LOG_BUFFER_ERROR_AND_THROW("Exactly one of the CPU_ACCESS_WRITE or CPU_ACCESS_READ flags must be specified for a cpu-accessible buffer")
@@ -171,7 +171,7 @@ BufferVkImpl :: BufferVkImpl(IReferenceCounters*        pRefCounters,
         VkMemoryRequirements MemReqs = LogicalDevice.GetBufferMemoryRequirements(m_VulkanBuffer);
 
         VkMemoryPropertyFlags BufferMemoryFlags = 0;
-        if (m_Desc.Usage == USAGE_CPU_ACCESSIBLE)
+        if (m_Desc.Usage == USAGE_STAGING)
             BufferMemoryFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
         else
             BufferMemoryFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
diff --git a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
index daabca38..eeb30132 100644
--- a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
@@ -1215,7 +1215,7 @@ namespace Diligent
         }
         else if(MapType == MAP_WRITE)
         {
-            if (BuffDesc.Usage == USAGE_CPU_ACCESSIBLE)
+            if (BuffDesc.Usage == USAGE_STAGING)
             {
                 LOG_ERROR("Not implemented");
                 UNSUPPORTED("Not implemented");
@@ -1248,7 +1248,7 @@ namespace Diligent
             }
             else
             {
-                LOG_ERROR("Only USAGE_DYNAMIC and USAGE_CPU_ACCESSIBLE Vk buffers can be mapped for writing");
+                LOG_ERROR("Only USAGE_DYNAMIC and USAGE_STAGING Vk buffers can be mapped for writing");
             }
         }
         else if(MapType == MAP_READ_WRITE)
@@ -1274,7 +1274,7 @@ namespace Diligent
         }
         else if(MapType == MAP_WRITE)
         {
-            if (BuffDesc.Usage == USAGE_CPU_ACCESSIBLE)
+            if (BuffDesc.Usage == USAGE_STAGING)
             {
                 LOG_ERROR("This map type is not yet supported");
                 UNSUPPORTED("This map type is not yet supported");
diff --git a/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp
index f6703fac..9838966e 100644
--- a/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/TextureVkImpl.cpp
@@ -146,7 +146,7 @@ TextureVkImpl :: TextureVkImpl(IReferenceCounters*          pRefCounters,
     VkMemoryRequirements MemReqs = LogicalDevice.GetImageMemoryRequirements(m_VulkanImage);
     
     VkMemoryPropertyFlags ImageMemoryFlags = 0;
-    if (m_Desc.Usage == USAGE_CPU_ACCESSIBLE)
+    if (m_Desc.Usage == USAGE_STAGING)
         ImageMemoryFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
     else
         ImageMemoryFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp
index e072dfb0..fd597327 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanMemoryManager.cpp
@@ -108,19 +108,19 @@ VulkanMemoryAllocation VulkanMemoryManager::Allocate(const VkMemoryRequirements&
     if (MemoryProps == VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT)
     {
         // There must be at least one memory type with the DEVICE_LOCAL_BIT bit set
-        VERIFY(MemoryTypeIndex != VulkanUtilities::VulkanPhysicalDevice::InvalidMemoryTypeIndex,
-               "Vulkan spec requires that memoryTypeBits member always contains "
-               "at least one bit set corresponding to a VkMemoryType with a propertyFlags that has the "
-               "VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT bit set (11.6)");
+        DEV_CHECK_ERR(MemoryTypeIndex != VulkanUtilities::VulkanPhysicalDevice::InvalidMemoryTypeIndex,
+                      "Vulkan spec requires that memoryTypeBits member always contains "
+                      "at least one bit set corresponding to a VkMemoryType with a propertyFlags that has the "
+                      "VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT bit set (11.6)");
     }
     else if ( (MemoryProps & (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) == (VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT))
     {
-        VERIFY(MemoryTypeIndex != VulkanUtilities::VulkanPhysicalDevice::InvalidMemoryTypeIndex,
-               "Vulkan spec requires that for a VkBuffer not created with the VK_BUFFER_CREATE_SPARSE_BINDING_BIT "
-               "bit set, or for a VkImage that was created with a VK_IMAGE_TILING_LINEAR value in the tiling member "
-               "of the VkImageCreateInfo structure passed to vkCreateImage, the memoryTypeBits member always contains "
-               "at least one bit set corresponding to a VkMemoryType with a propertyFlags that has both the "
-               "VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT bit AND the VK_MEMORY_PROPERTY_HOST_COHERENT_BIT bit set. (11.6)");
+        DEV_CHECK_ERR(MemoryTypeIndex != VulkanUtilities::VulkanPhysicalDevice::InvalidMemoryTypeIndex,
+                      "Vulkan spec requires that for a VkBuffer not created with the VK_BUFFER_CREATE_SPARSE_BINDING_BIT "
+                      "bit set, or for a VkImage that was created with a VK_IMAGE_TILING_LINEAR value in the tiling member "
+                      "of the VkImageCreateInfo structure passed to vkCreateImage, the memoryTypeBits member always contains "
+                      "at least one bit set corresponding to a VkMemoryType with a propertyFlags that has both the "
+                      "VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT bit AND the VK_MEMORY_PROPERTY_HOST_COHERENT_BIT bit set. (11.6)");
     }
     else if (MemoryTypeIndex == VulkanUtilities::VulkanPhysicalDevice::InvalidMemoryTypeIndex)
     {
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};