| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2011 Google Inc. | 2  * Copyright 2011 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 | 8 | 
| 9 #ifndef GrGLTexture_DEFINED | 9 #ifndef GrGLTexture_DEFINED | 
| 10 #define GrGLTexture_DEFINED | 10 #define GrGLTexture_DEFINED | 
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 42     typedef GrRefCnt INHERITED; | 42     typedef GrRefCnt INHERITED; | 
| 43 }; | 43 }; | 
| 44 | 44 | 
| 45 //////////////////////////////////////////////////////////////////////////////// | 45 //////////////////////////////////////////////////////////////////////////////// | 
| 46 | 46 | 
| 47 | 47 | 
| 48 class GrGLTexture : public GrTexture { | 48 class GrGLTexture : public GrTexture { | 
| 49 | 49 | 
| 50 public: | 50 public: | 
| 51     struct TexParams { | 51     struct TexParams { | 
| 52         GrGLenum fFilter; | 52         GrGLenum fMinFilter; | 
|  | 53         GrGLenum fMagFilter; | 
| 53         GrGLenum fWrapS; | 54         GrGLenum fWrapS; | 
| 54         GrGLenum fWrapT; | 55         GrGLenum fWrapT; | 
| 55         GrGLenum fSwizzleRGBA[4]; | 56         GrGLenum fSwizzleRGBA[4]; | 
| 56         void invalidate() { memset(this, 0xff, sizeof(TexParams)); } | 57         void invalidate() { memset(this, 0xff, sizeof(TexParams)); } | 
| 57     }; | 58     }; | 
| 58 | 59 | 
| 59     struct Desc : public GrTextureDesc { | 60     struct Desc : public GrTextureDesc { | 
| 60         GrGLuint        fTextureID; | 61         GrGLuint        fTextureID; | 
| 61         bool            fIsWrapped; | 62         bool            fIsWrapped; | 
| 62     }; | 63     }; | 
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 101     SkAutoTUnref<GrGLTexID>         fTexIDObj; | 102     SkAutoTUnref<GrGLTexID>         fTexIDObj; | 
| 102 | 103 | 
| 103     void init(GrGpuGL* gpu, | 104     void init(GrGpuGL* gpu, | 
| 104               const Desc& textureDesc, | 105               const Desc& textureDesc, | 
| 105               const GrGLRenderTarget::Desc* rtDesc); | 106               const GrGLRenderTarget::Desc* rtDesc); | 
| 106 | 107 | 
| 107     typedef GrTexture INHERITED; | 108     typedef GrTexture INHERITED; | 
| 108 }; | 109 }; | 
| 109 | 110 | 
| 110 #endif | 111 #endif | 
| OLD | NEW | 
|---|