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

Side by Side Diff: src/gpu/gl/GrGLTexture.h

Issue 278073002: Revert of Factor GrTexture into public GrTexture and private GrTextureImpl. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/gpu/GrTexture.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 27 matching lines...) Expand all
38 const GrGLInterface* fGL; 38 const GrGLInterface* fGL;
39 GrGLuint fTexID; 39 GrGLuint fTexID;
40 bool fIsWrapped; 40 bool fIsWrapped;
41 41
42 typedef SkRefCnt INHERITED; 42 typedef SkRefCnt INHERITED;
43 }; 43 };
44 44
45 //////////////////////////////////////////////////////////////////////////////// 45 ////////////////////////////////////////////////////////////////////////////////
46 46
47 47
48 class GrGLTexture : public GrTextureImpl { 48 class GrGLTexture : public GrTexture {
49 49
50 public: 50 public:
51 struct TexParams { 51 struct TexParams {
52 GrGLenum fMinFilter; 52 GrGLenum fMinFilter;
53 GrGLenum fMagFilter; 53 GrGLenum fMagFilter;
54 GrGLenum fWrapS; 54 GrGLenum fWrapS;
55 GrGLenum fWrapT; 55 GrGLenum fWrapT;
56 GrGLenum fSwizzleRGBA[4]; 56 GrGLenum fSwizzleRGBA[4];
57 void invalidate() { memset(this, 0xff, sizeof(TexParams)); } 57 void invalidate() { memset(this, 0xff, sizeof(TexParams)); }
58 }; 58 };
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 private: 99 private:
100 TexParams fTexParams; 100 TexParams fTexParams;
101 GrGpu::ResetTimestamp fTexParamsTimestamp; 101 GrGpu::ResetTimestamp fTexParamsTimestamp;
102 SkAutoTUnref<GrGLTexID> fTexIDObj; 102 SkAutoTUnref<GrGLTexID> fTexIDObj;
103 103
104 void init(GrGpuGL* gpu, 104 void init(GrGpuGL* gpu,
105 const Desc& textureDesc, 105 const Desc& textureDesc,
106 const GrGLRenderTarget::Desc* rtDesc); 106 const GrGLRenderTarget::Desc* rtDesc);
107 107
108 typedef GrTextureImpl INHERITED; 108 typedef GrTexture INHERITED;
109 }; 109 };
110 110
111 #endif 111 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrTexture.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698