Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(265)

Unified Diff: src/gpu/gl/GrGLSL.h

Issue 13852013: Fix gyp files to allow ninja to build 64 bit on Mac. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix build by handling kLineTypeCount in switch Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_conditions.gypi ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLSL.h
diff --git a/src/gpu/gl/GrGLSL.h b/src/gpu/gl/GrGLSL.h
index 869b0e180c44d0fd2a2ff68e556a23a6c8eba02a..883cc9b41accd7b342ef21076c11255ce66acd08 100644
--- a/src/gpu/gl/GrGLSL.h
+++ b/src/gpu/gl/GrGLSL.h
@@ -54,7 +54,7 @@ static inline int GrSLTypeToVecLength(GrSLType type) {
1, // kMat44f_GrSLType
1, // kSampler2D_GrSLType
};
- GrAssert((size_t) type < GR_ARRAY_COUNT(kVecLengths));
+ GR_STATIC_ASSERT(kGrSLTypeCount == GR_ARRAY_COUNT(kVecLengths));
return kVecLengths[type];
}
« no previous file with comments | « gyp/common_conditions.gypi ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698