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

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

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 years, 3 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
« no previous file with comments | « src/gpu/gl/GrGLSL.cpp ('k') | src/gpu/gl/GrGLTexture.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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 *timestamp = fTexParamsTimestamp; 82 *timestamp = fTexParamsTimestamp;
83 return fTexParams; 83 return fTexParams;
84 } 84 }
85 85
86 void setCachedTexParams(const TexParams& texParams, 86 void setCachedTexParams(const TexParams& texParams,
87 GrGpu::ResetTimestamp timestamp) { 87 GrGpu::ResetTimestamp timestamp) {
88 fTexParams = texParams; 88 fTexParams = texParams;
89 fTexParamsTimestamp = timestamp; 89 fTexParamsTimestamp = timestamp;
90 } 90 }
91 91
92 GrGLuint textureID() const { return (NULL != fTexIDObj.get()) ? fTexIDObj->i d() : 0; } 92 GrGLuint textureID() const { return (fTexIDObj.get()) ? fTexIDObj->id() : 0; }
93 93
94 protected: 94 protected:
95 // overrides of GrTexture 95 // overrides of GrTexture
96 virtual void onAbandon() SK_OVERRIDE; 96 virtual void onAbandon() SK_OVERRIDE;
97 virtual void onRelease() SK_OVERRIDE; 97 virtual void onRelease() SK_OVERRIDE;
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 GrTextureImpl INHERITED;
109 }; 109 };
110 110
111 #endif 111 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLSL.cpp ('k') | src/gpu/gl/GrGLTexture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698