Prep #1 for making GrDrawState a class

Review URL: http://codereview.appspot.com/5437138/




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

1 files changed, 6 insertions, 6 deletions

diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
index 3b4b849fd7..aadd648434 100644
--- a/include/gpu/GrPaint.h
+++ b/include/gpu/GrPaint.h
@@ -51,14 +51,14 @@ public:
         return fTextures[i]; 
     }
 
-    GrSamplerState* getTextureSampler(int i) {
+    GrSamplerState* textureSampler(int i) {
         GrAssert((unsigned)i < kMaxTextures);
         return fTextureSamplers + i;
     }
 
-    const GrSamplerState* getTextureSampler(int i) const {
+    const GrSamplerState& getTextureSampler(int i) const {
         GrAssert((unsigned)i < kMaxTextures);
-        return fTextureSamplers + i;
+        return fTextureSamplers[i];
     }
 
     // The mask can be alpha-only or per channel. It is applied
@@ -77,14 +77,14 @@ public:
 
     // mask's sampler matrix is always applied to the positions
     // (i.e. no explicit texture coordinates)
-    GrSamplerState* getMaskSampler(int i) {
+    GrSamplerState* maskSampler(int i) {
         GrAssert((unsigned)i < kMaxMasks);
         return fMaskSamplers + i;
     }
 
-    const GrSamplerState* getMaskSampler(int i) const {
+    const GrSamplerState& getMaskSampler(int i) const {
         GrAssert((unsigned)i < kMaxMasks);
-        return fMaskSamplers + i;
+        return fMaskSamplers[i];
     }
 
     // pre-concats sampler matrices for non-NULL textures and masks