commit b9b088f57e3d4567b9441251170cf1719125b2d1
author Corentin Wallez <cwallez@chromium.org> Tue Aug 27 08:42:29 2019 +0000
committer Commit Bot service account <commit-bot@chromium.org> Tue Aug 27 08:42:29 2019 +0000
tree 2054ab64d3961740535711457d9de1e34099c5ca
parent 9e9e29f7a6ee4a2d8c26215d80a137c9e68a37fd

Rename ShaderStageBit to ShaderStage.

This is to follow changes to WebGPU's IDL and header file where the Bit
suffix disappeared. This caused a conflict with
utils/dawn_native::ShaderStage that were both renamed to
SingleShaderStage.

BUG-dawn: 22
Change-Id: I7b085686775fa19e4b4a3b54979903d72f3ef660
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/10462
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn_native/opengl/PipelineGL.cpp

diff --git a/src/dawn_native/opengl/PipelineGL.cpp b/src/dawn_native/opengl/PipelineGL.cpp
index f7adf95..57d7264 100644
--- a/src/dawn_native/opengl/PipelineGL.cpp
+++ b/src/dawn_native/opengl/PipelineGL.cpp
@@ -28,13 +28,13 @@
 
     namespace {
 
-        GLenum GLShaderType(ShaderStage stage) {
+        GLenum GLShaderType(SingleShaderStage stage) {
             switch (stage) {
-                case ShaderStage::Vertex:
+                case SingleShaderStage::Vertex:
                     return GL_VERTEX_SHADER;
-                case ShaderStage::Fragment:
+                case SingleShaderStage::Fragment:
                     return GL_FRAGMENT_SHADER;
-                case ShaderStage::Compute:
+                case SingleShaderStage::Compute:
                     return GL_COMPUTE_SHADER;
                 default:
                     UNREACHABLE();
@@ -74,14 +74,14 @@
 
         mProgram = gl.CreateProgram();
 
-        dawn::ShaderStageBit activeStages = dawn::ShaderStageBit::None;
-        for (ShaderStage stage : IterateStages(kAllStages)) {
+        dawn::ShaderStage activeStages = dawn::ShaderStage::None;
+        for (SingleShaderStage stage : IterateStages(kAllStages)) {
             if (modules[stage] != nullptr) {
                 activeStages |= StageBit(stage);
             }
         }
 
-        for (ShaderStage stage : IterateStages(activeStages)) {
+        for (SingleShaderStage stage : IterateStages(activeStages)) {
             GLuint shader = CreateShader(gl, GLShaderType(stage), modules[stage]->GetSource());
             gl.AttachShader(mProgram, shader);
         }
@@ -153,7 +153,7 @@
         // Compute links between stages for combined samplers, then bind them to texture units
         {
             std::set<CombinedSampler> combinedSamplersSet;
-            for (ShaderStage stage : IterateStages(activeStages)) {
+            for (SingleShaderStage stage : IterateStages(activeStages)) {
                 for (const auto& combined : modules[stage]->GetCombinedSamplerInfo()) {
                     combinedSamplersSet.insert(combined);
                 }