commit 0d50a2c77013b2996ad34dc4044ef3b0255509cf
author Brandon Jones <bajones@chromium.org> Wed Jun 09 18:07:32 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jun 09 18:07:32 2021 +0000
tree a188c5cf6cb2460518841b5f12c3dd80b91e023b
parent e5b9903cc1ee5bc8cdf35820092f17d0570c41ef

ComputePipelineDescriptor.computeStage->compute

Deprecates the computeStage member of the descriptor in favor of compute
as described by the spec. In order to support both variants without
breaking backwards compatibility some code had to be manually added to
the wire client to copy from the deprecated member to the new one and
visa versa.

Change-Id: I9d5c2fc9c446c927c5792c9af9ed56c90060b65b
Bug: dawn:800
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/53884
Commit-Queue: Brandon Jones <bajones@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/dawn_native/ComputePipeline.cpp

diff --git a/src/dawn_native/ComputePipeline.cpp b/src/dawn_native/ComputePipeline.cpp
index 9515d3a..8ae593b 100644
--- a/src/dawn_native/ComputePipeline.cpp
+++ b/src/dawn_native/ComputePipeline.cpp
@@ -29,9 +29,19 @@
             DAWN_TRY(device->ValidateObject(descriptor->layout));
         }
 
-        DAWN_TRY(ValidateProgrammableStage(device, descriptor->computeStage.module,
-                                           descriptor->computeStage.entryPoint, descriptor->layout,
-                                           SingleShaderStage::Compute));
+        if (descriptor->compute.module != nullptr) {
+            DAWN_TRY(ValidateProgrammableStage(device, descriptor->compute.module,
+                                               descriptor->compute.entryPoint, descriptor->layout,
+                                               SingleShaderStage::Compute));
+        } else {
+            // TODO(dawn:800): Remove after deprecation period.
+            device->EmitDeprecationWarning(
+                "computeStage has been deprecated. Please begin using compute instead.");
+            DAWN_TRY(ValidateProgrammableStage(device, descriptor->computeStage.module,
+                                               descriptor->computeStage.entryPoint,
+                                               descriptor->layout, SingleShaderStage::Compute));
+        }
+
         return {};
     }
 
@@ -41,8 +51,8 @@
                                              const ComputePipelineDescriptor* descriptor)
         : PipelineBase(device,
                        descriptor->layout,
-                       {{SingleShaderStage::Compute, descriptor->computeStage.module,
-                         descriptor->computeStage.entryPoint}}) {
+                       {{SingleShaderStage::Compute, descriptor->compute.module,
+                         descriptor->compute.entryPoint}}) {
     }
 
     ComputePipelineBase::ComputePipelineBase(DeviceBase* device, ObjectBase::ErrorTag tag)