commit a0c9832882e9b7c6d354b9ffce706de783362be6
author csmartdalton <csmartdalton@google.com> Tue Feb 14 10:53:41 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 15 16:02:41 2017 +0000
tree 45e3f854a8b27c53cf7b72e98e962addaf771de8
parent 26e573c7ef17b96bb91c1e8dec86ca14efa6d0fb

Remove GL asserts for geo shaders to not have uniforms

BUG=skia:

Change-Id: I51468c808f8a2e6593c237b4c4368df2f6729dff
Reviewed-on: https://skia-review.googlesource.com/8421
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/gl/GrGLUniformHandler.cpp

diff --git a/src/gpu/gl/GrGLUniformHandler.cpp b/src/gpu/gl/GrGLUniformHandler.cpp
index 021a865..b00779b 100644
--- a/src/gpu/gl/GrGLUniformHandler.cpp
+++ b/src/gpu/gl/GrGLUniformHandler.cpp
@@ -23,8 +23,6 @@
                                                                             int arrayCount,
                                                                             const char** outName) {
     SkASSERT(name && strlen(name));
-    SkDEBUGCODE(static const uint32_t kVisMask = kVertex_GrShaderFlag | kFragment_GrShaderFlag);
-    SkASSERT(0 == (~kVisMask & visibility));
     SkASSERT(0 != visibility);
     SkASSERT(kDefault_GrSLPrecision == precision || GrSLTypeAcceptsPrecision(type));
 
@@ -59,8 +57,6 @@
                                                                    GrSLPrecision precision,
                                                                    const char* name) {
     SkASSERT(name && strlen(name));
-    SkDEBUGCODE(static const uint32_t kVisMask = kVertex_GrShaderFlag | kFragment_GrShaderFlag);
-    SkASSERT(0 == (~kVisMask & visibility));
     SkASSERT(0 != visibility);
 
     SkString mangleName;
@@ -84,8 +80,6 @@
         uint32_t visibility, GrSLType type, GrImageStorageFormat format, GrSLMemoryModel model,
         GrSLRestrict restrict, GrIOType ioType, const char* name) {
     SkASSERT(name && strlen(name));
-    SkDEBUGCODE(static const uint32_t kVisMask = kVertex_GrShaderFlag | kFragment_GrShaderFlag);
-    SkASSERT(0 == (~kVisMask & visibility));
     SkASSERT(0 != visibility);
     SkString mangleName;
     char prefix = 'u';