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

Unified Diff: src/gpu/GrTextureAccess.cpp

Issue 13121002: Make GrGLShaderBuilder::TextureSampler extract only required info from GrTextureAccess. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 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
Index: src/gpu/GrTextureAccess.cpp
===================================================================
--- src/gpu/GrTextureAccess.cpp (revision 8417)
+++ src/gpu/GrTextureAccess.cpp (working copy)
@@ -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.");

Powered by Google App Engine
This is Rietveld 408576698