commit b8670998a59d305cd22a3c0cbdc6e075b0a37a6e
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 25 21:27:09 2012 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jul 25 21:27:09 2012 +0000
tree 76791b806a3a6608e5a5735150c0535dc50a872a
parent cc90505674cd845fcbebd7e0654c3ff04a2e4f25

Move filter/wrap out of GrSamplerState into GrTextureParams

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




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

include/gpu/GrTexture.h

diff --git a/include/gpu/GrTexture.h b/include/gpu/GrTexture.h
index 783a147..d4a7cc6 100644
--- a/include/gpu/GrTexture.h
+++ b/include/gpu/GrTexture.h
@@ -13,7 +13,7 @@
 
 class GrRenderTarget;
 class GrResourceKey;
-class GrSamplerState;
+class GrTextureParams;
 
 /*
  * All uncached textures should have this value as their fClientCacheID
@@ -162,7 +162,7 @@
 #endif
 
     static GrResourceKey ComputeKey(const GrGpu* gpu,
-                                    const GrSamplerState* sampler,
+                                    const GrTextureParams* sampler,
                                     const GrTextureDesc& desc,
                                     bool scratch);