commit ce33059365d2f59150e85631c3ecc715dfe34e03
author Clemen Deng <clemendeng@google.com> Tue Jul 16 10:02:21 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Fri Jul 19 14:57:07 2019 +0000
tree c8dfcb2b0067e42778c0088af7492bdcedee6ebc
parent 3c4cfad19f14a9ac41ce0c8de0cd59e194ba26b5

Rename ProvokingVertex and TextureBarrier

Need to rename these so that they don't conflict
with GL function declarations

Bug: angleproject:3702
Change-Id: Iefe490cb53a384c45f0d0024321deda43b461bcc
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1704214
Reviewed-by: Jonah Ryan-Davis <jonahr@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Clemen Deng <clemendeng@google.com>

src/libANGLE/validationES2.cpp

diff --git a/src/libANGLE/validationES2.cpp b/src/libANGLE/validationES2.cpp
index 3bc0970..df0aab4 100644
--- a/src/libANGLE/validationES2.cpp
+++ b/src/libANGLE/validationES2.cpp
@@ -7124,7 +7124,7 @@
     return true;
 }
 
-bool ValidateProvokingVertexANGLE(Context *context, ProvokingVertex modePacked)
+bool ValidateProvokingVertexANGLE(Context *context, ProvokingVertexConvention modePacked)
 {
     if (!context->getExtensions().provokingVertex)
     {
@@ -7134,8 +7134,8 @@
 
     switch (modePacked)
     {
-        case ProvokingVertex::FirstVertexConvention:
-        case ProvokingVertex::LastVertexConvention:
+        case ProvokingVertexConvention::FirstVertexConvention:
+        case ProvokingVertexConvention::LastVertexConvention:
             break;
         default:
             context->validationError(GL_INVALID_ENUM, kInvalidProvokingVertex);