GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.10

Browse Source 
# Conflicts:
#	Source/Engine/Graphics/Materials/MaterialShader.h
This commit is contained in:
Wojtek Figat
2025-02-18 09:19:59 +01:00
parent d501018feb c81ddd09cc
commit a6fb651ff4
133 changed files with 2253 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Engine/Graphics/GPUBuffer.cpp
View File

@@ -113,6 +113,15 @@ GPUBufferDescription GPUBufferDescription::ToStagingReadback() const
return desc;
}
GPUBufferDescription GPUBufferDescription::ToStaging() const
{
auto desc = *this;
desc.Usage = GPUResourceUsage::Staging;
desc.Flags = GPUBufferFlags::None;
desc.InitData = nullptr;
return desc;
}
bool GPUBufferDescription::Equals(const GPUBufferDescription& other) const
{
return Size == other.Size
@@ -167,6 +176,16 @@ GPUBuffer::GPUBuffer()
_desc.Size = 0;
}
bool GPUBuffer::IsStaging() const
{
return _desc.Usage == GPUResourceUsage::StagingReadback || _desc.Usage == GPUResourceUsage::StagingUpload || _desc.Usage == GPUResourceUsage::Staging;
}
bool GPUBuffer::IsDynamic() const
{
return _desc.Usage == GPUResourceUsage::Dynamic;
}
bool GPUBuffer::Init(const GPUBufferDescription& desc)
{
// Validate description
@@ -280,7 +299,7 @@ bool GPUBuffer::DownloadData(BytesContainer& result)
LOG(Warning, "Cannot download GPU buffer data from an empty buffer.");
return true;
}
if (_desc.Usage == GPUResourceUsage::StagingReadback || _desc.Usage == GPUResourceUsage::Dynamic)
if (_desc.Usage == GPUResourceUsage::StagingReadback || _desc.Usage == GPUResourceUsage::Dynamic || _desc.Usage == GPUResourceUsage::Staging)
{
// Use faster path for staging resources
return GetData(result);