encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-21 02:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

CopyTextureForBrowser: Support flipY option

Browse Source 
This CL enable CopyTextureForBrowser to accept options. The first
supported option is flipY, which can be implemented through scale and
offset uniforms.

BUG=dawn:465

Change-Id: Ia90153ee63a50e0e40beb1c13c63764d19a0b809
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/34402
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Yan, Shaobo
2020-12-02 08:13:09 +00:00
committed by Commit Bot service account
parent 6f5151f657
commit bb913a94da
6 changed files with 133 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/dawn_native/CopyTextureForBrowserHelper.cpp
View File

@@ -93,6 +93,16 @@ namespace dawn_native {
return {};
}
MaybeError ValidateCopyTextureForBrowserOptions(
const CopyTextureForBrowserOptions* options) {
if (options->nextInChain != nullptr) {
return DAWN_VALIDATION_ERROR(
"CopyTextureForBrowserOptions: nextInChain must be nullptr");
}
return {};
}
RenderPipelineBase* GetOrCreateCopyTextureForBrowserPipeline(DeviceBase* device) {
InternalPipelineStore* store = device->GetInternalPipelineStore();
@@ -162,7 +172,8 @@ namespace dawn_native {
MaybeError ValidateCopyTextureForBrowser(DeviceBase* device,
const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize) {
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options) {
DAWN_TRY(device->ValidateObject(source->texture));
DAWN_TRY(device->ValidateObject(destination->texture));
@@ -180,6 +191,8 @@ namespace dawn_native {
DAWN_TRY(ValidateCopyTextureFormatConversion(source->texture->GetFormat().format,
destination->texture->GetFormat().format));
DAWN_TRY(ValidateCopyTextureForBrowserOptions(options));
// TODO(shaobo.yan@intel.com): Support the simplest case for now that source and destination
// texture has the same size and do full texture blit. Will address sub texture blit in
// future and remove these validations.
@@ -197,7 +210,8 @@ namespace dawn_native {
MaybeError DoCopyTextureForBrowser(DeviceBase* device,
const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize) {
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options) {
// TODO(shaobo.yan@intel.com): In D3D12 and Vulkan, compatible texture format can directly
// copy to each other. This can be a potential fast path.
RenderPipelineBase* pipeline = GetOrCreateCopyTextureForBrowserPipeline(device);
@@ -213,20 +227,24 @@ namespace dawn_native {
bgDesc.entries = bindGroupEntries;
// Prepare binding 0 resource: uniform buffer.
// TODO(shaobo.yan@intel.com): Will use scale vector and offset vector to replace the
// 4x4 rotation matrix here.
const float rotationMatrix[] = {
float uniformData[] = {
1.0, 1.0, // scale
0.0, 0.0 // offset
};
BufferDescriptor rotationUniformDesc = {};
rotationUniformDesc.usage = wgpu::BufferUsage::CopyDst | wgpu::BufferUsage::Uniform;
rotationUniformDesc.size = sizeof(rotationMatrix);
Ref<BufferBase> rotationUniform = AcquireRef(device->CreateBuffer(&rotationUniformDesc));
// Handle flipY.
if (options && options->flipY) {
uniformData[1] *= -1.0;
uniformData[3] += 1.0;
}
device->GetDefaultQueue()->WriteBuffer(rotationUniform.Get(), 0, rotationMatrix,
sizeof(rotationMatrix));
BufferDescriptor uniformDesc = {};
uniformDesc.usage = wgpu::BufferUsage::CopyDst | wgpu::BufferUsage::Uniform;
uniformDesc.size = sizeof(uniformData);
Ref<BufferBase> uniformBuffer = AcquireRef(device->CreateBuffer(&uniformDesc));
device->GetDefaultQueue()->WriteBuffer(uniformBuffer.Get(), 0, uniformData,
sizeof(uniformData));
// Prepare binding 1 resource: sampler
// Use default configuration, filterMode set to Nearest for min and mag.
@@ -242,8 +260,8 @@ namespace dawn_native {
// Set bind group entries.
bindGroupEntries[0].binding = 0;
bindGroupEntries[0].buffer = rotationUniform.Get();
bindGroupEntries[0].size = sizeof(rotationMatrix);
bindGroupEntries[0].buffer = uniformBuffer.Get();
bindGroupEntries[0].size = sizeof(uniformData);
bindGroupEntries[1].binding = 1;
bindGroupEntries[1].sampler = sampler.Get();
bindGroupEntries[2].binding = 2;

7
src/dawn_native/CopyTextureForBrowserHelper.h
View File

@@ -22,16 +22,19 @@ namespace dawn_native {
class DeviceBase;
struct Extent3D;
struct TextureCopyView;
struct CopyTextureForBrowserOptions;
MaybeError ValidateCopyTextureForBrowser(DeviceBase* device,
const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize);
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options);
MaybeError DoCopyTextureForBrowser(DeviceBase* device,
const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize);
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options);
} // namespace dawn_native

19
src/dawn_native/Queue.cpp
View File

@@ -312,18 +312,23 @@ namespace dawn_native {
void QueueBase::CopyTextureForBrowser(const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize) {
GetDevice()->ConsumedError(CopyTextureForBrowserInternal(source, destination, copySize));
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options) {
GetDevice()->ConsumedError(
CopyTextureForBrowserInternal(source, destination, copySize, options));
}
MaybeError QueueBase::CopyTextureForBrowserInternal(const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize) {
MaybeError QueueBase::CopyTextureForBrowserInternal(
const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options) {
if (GetDevice()->IsValidationEnabled()) {
DAWN_TRY(ValidateCopyTextureForBrowser(GetDevice(), source, destination, copySize));
DAWN_TRY(
ValidateCopyTextureForBrowser(GetDevice(), source, destination, copySize, options));
}
return DoCopyTextureForBrowser(GetDevice(), source, destination, copySize);
return DoCopyTextureForBrowser(GetDevice(), source, destination, copySize, options);
}
MaybeError QueueBase::ValidateSubmit(uint32_t commandCount,

6
src/dawn_native/Queue.h
View File

@@ -47,7 +47,8 @@ namespace dawn_native {
const Extent3D* writeSize);
void CopyTextureForBrowser(const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize);
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options);
void TrackTask(std::unique_ptr<TaskInFlight> task, ExecutionSerial serial);
void Tick(ExecutionSerial finishedSerial);
@@ -68,7 +69,8 @@ namespace dawn_native {
const Extent3D* writeSize);
MaybeError CopyTextureForBrowserInternal(const TextureCopyView* source,
const TextureCopyView* destination,
const Extent3D* copySize);
const Extent3D* copySize,
const CopyTextureForBrowserOptions* options);
virtual MaybeError SubmitImpl(uint32_t commandCount,
CommandBufferBase* const* commands) = 0;