commit 1e257a5db32e1c9e3b0dba80f43470816ef948af
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 06 19:52:16 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 06 19:52:16 2011 +0000
tree f34fff9c1244a4861cc61e9f377bb845a7f09f64
parent 45f9ce7a62b27fc2ebd87e9a348a6c3f6dfde3af

Remove nested scope resolutions in GrGpuGLShaders and use enum counts for generating random values in unit test.



git-svn-id: http://skia.googlecode.com/svn/trunk@1807 2bbb7eff-a529-9590-31e7-b0007b416f81

gpu/src/GrGLProgram.h

diff --git a/gpu/src/GrGLProgram.h b/gpu/src/GrGLProgram.h
index 5c4727b..2c4152d 100644
--- a/gpu/src/GrGLProgram.h
+++ b/gpu/src/GrGLProgram.h
@@ -107,17 +107,23 @@
             };
             enum Modulation {
                 kColor_Modulation,
-                kAlpha_Modulation
+                kAlpha_Modulation,
+
+                kModulationCnt
             };
             enum FetchMode {
                 kSingle_FetchMode,
-                k2x2_FetchMode
+                k2x2_FetchMode,
+
+                kFetchModeCnt,
             };
             enum CoordMapping {
                 kIdentity_CoordMapping,
                 kRadialGradient_CoordMapping,
                 kSweepGradient_CoordMapping,
-                kRadial2Gradient_CoordMapping
+                kRadial2Gradient_CoordMapping,
+
+                kCoordMappingCnt
             };
 
             uint8_t fOptFlags;
@@ -150,6 +156,7 @@
             kCoverage_DualSrcOutput,
             kCoverageISA_DualSrcOutput,
             kCoverageISC_DualSrcOutput,
+
             kDualSrcOutputCnt
         };