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

# Conflicts:
#	Source/Engine/Graphics/Materials/MaterialShader.h
This commit is contained in:
Wojtek Figat
2025-02-18 09:19:59 +01:00
133 changed files with 2253 additions and 654 deletions

View File

@@ -320,7 +320,7 @@ namespace FlaxEngine
}
/// <summary>
/// Gets the staging upload description for this instance.
/// Gets the staging upload (CPU write) description for this instance.
/// </summary>
/// <returns>A staging buffer description</returns>
public GPUBufferDescription ToStagingUpload()
@@ -333,7 +333,7 @@ namespace FlaxEngine
}
/// <summary>
/// Gets the staging readback description for this instance.
/// Gets the staging readback (CPU read) description for this instance.
/// </summary>
/// <returns>A staging buffer description</returns>
public GPUBufferDescription ToStagingReadback()
@@ -345,6 +345,19 @@ namespace FlaxEngine
return desc;
}
/// <summary>
/// Gets the staging (CPU read/write) description for this instance.
/// </summary>
/// <returns>A staging buffer description</returns>
public GPUBufferDescription ToStaging()
{
var desc = this;
desc.Usage = GPUResourceUsage.Staging;
desc.Flags = GPUBufferFlags.None;
desc.InitData = IntPtr.Zero;
return desc;
}
/// <inheritdoc />
public bool Equals(GPUBufferDescription other)
{