commit b8eb2e89edf914caf5479baeffcb670d3e93f496
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Mar 28 13:46:42 2013 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Mar 28 13:46:42 2013 +0000
tree 328527b349cf6cc24c07be4f466ebe35a34c230f
parent 51c81123afbf9a09fda43ca2d287fcf4f5593e9c

Make GrGLShaderBuilder::TextureSampler extract only required info from GrTextureAccess.

This will make it possible to init a TextureSampler without a texture or a specific config.

Also unify two separate bitfields of color components in GPU code.
Review URL: https://codereview.chromium.org/13121002

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

src/gpu/GrTextureAccess.cpp

diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp
index 5c3a36d..499b1f2 100644
--- a/src/gpu/GrTextureAccess.cpp
+++ b/src/gpu/GrTextureAccess.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "GrTextureAccess.h"
-
+#include "GrColor.h"
 #include "GrTexture.h"
 
 GrTextureAccess::GrTextureAccess() {
@@ -68,7 +68,7 @@
     fTexture.reset(SkRef(texture));
     fParams = params;
     memcpy(fSwizzle, "rgba", 5);
-    fSwizzleMask = (kRGB_SwizzleMask | kA_SwizzleFlag);
+    fSwizzleMask = kRGBA_GrColorComponentFlags;
 }
 
 void GrTextureAccess::reset(GrTexture* texture,
@@ -78,7 +78,7 @@
     fTexture.reset(SkRef(texture));
     fParams.reset(tileXAndY, bilerp);
     memcpy(fSwizzle, "rgba", 5);
-    fSwizzleMask = (kRGB_SwizzleMask | kA_SwizzleFlag);
+    fSwizzleMask = kRGBA_GrColorComponentFlags;
 }
 
 void GrTextureAccess::setSwizzle(const char* swizzle) {
@@ -88,16 +88,16 @@
         fSwizzle[i] = swizzle[i];
         switch (swizzle[i]) {
             case 'r':
-                fSwizzleMask |= kR_SwizzleFlag;
+                fSwizzleMask |= kR_GrColorComponentFlag;
                 break;
             case 'g':
-                fSwizzleMask |= kG_SwizzleFlag;
+                fSwizzleMask |= kG_GrColorComponentFlag;
                 break;
             case 'b':
-                fSwizzleMask |= kB_SwizzleFlag;
+                fSwizzleMask |= kB_GrColorComponentFlag;
                 break;
             case 'a':
-                fSwizzleMask |= kA_SwizzleFlag;
+                fSwizzleMask |= kA_GrColorComponentFlag;
                 break;
             default:
                 GrCrash("Unexpected swizzle string character.");