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.cpp

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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/gl/GrGLProgram.cpp ('k') | src/gpu/gl/GrGpuGL_program.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 #include "GrGLTexture.h" 8 #include "GrGLTexture.h"
9 #include "GrGpuGL.h" 9 #include "GrGpuGL.h"
10 10
11 SK_DEFINE_INST_COUNT(GrGLTexID)
12
13 #define GPUGL static_cast<GrGpuGL*>(getGpu()) 11 #define GPUGL static_cast<GrGpuGL*>(getGpu())
14 12
15 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) 13 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
16 14
17 void GrGLTexture::init(GrGpuGL* gpu, 15 void GrGLTexture::init(GrGpuGL* gpu,
18 const Desc& textureDesc, 16 const Desc& textureDesc,
19 const GrGLRenderTarget::Desc* rtDesc) { 17 const GrGLRenderTarget::Desc* rtDesc) {
20 18
21 SkASSERT(0 != textureDesc.fTextureID); 19 SkASSERT(0 != textureDesc.fTextureID);
22 20
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 fTexIDObj->abandon(); 59 fTexIDObj->abandon();
62 fTexIDObj.reset(NULL); 60 fTexIDObj.reset(NULL);
63 } 61 }
64 62
65 INHERITED::onAbandon(); 63 INHERITED::onAbandon();
66 } 64 }
67 65
68 GrBackendObject GrGLTexture::getTextureHandle() const { 66 GrBackendObject GrGLTexture::getTextureHandle() const {
69 return static_cast<GrBackendObject>(this->textureID()); 67 return static_cast<GrBackendObject>(this->textureID());
70 } 68 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgram.cpp ('k') | src/gpu/gl/GrGpuGL_program.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698