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

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

Issue 22850006: Replace uses of GrAssert by SkASSERT. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebase Created 7 years, 4 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/gl/GrGLShaderVar.h ('k') | src/gpu/gl/GrGLUniformManager.h » ('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) 11 SK_DEFINE_INST_COUNT(GrGLTexID)
12 12
13 #define GPUGL static_cast<GrGpuGL*>(getGpu()) 13 #define GPUGL static_cast<GrGpuGL*>(getGpu())
14 14
15 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) 15 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
16 16
17 void GrGLTexture::init(GrGpuGL* gpu, 17 void GrGLTexture::init(GrGpuGL* gpu,
18 const Desc& textureDesc, 18 const Desc& textureDesc,
19 const GrGLRenderTarget::Desc* rtDesc) { 19 const GrGLRenderTarget::Desc* rtDesc) {
20 20
21 GrAssert(0 != textureDesc.fTextureID); 21 SkASSERT(0 != textureDesc.fTextureID);
22 22
23 fTexParams.invalidate(); 23 fTexParams.invalidate();
24 fTexParamsTimestamp = GrGpu::kExpiredTimestamp; 24 fTexParamsTimestamp = GrGpu::kExpiredTimestamp;
25 fTexIDObj.reset(SkNEW_ARGS(GrGLTexID, (GPUGL->glInterface(), 25 fTexIDObj.reset(SkNEW_ARGS(GrGLTexID, (GPUGL->glInterface(),
26 textureDesc.fTextureID, 26 textureDesc.fTextureID,
27 textureDesc.fIsWrapped))); 27 textureDesc.fIsWrapped)));
28 28
29 if (NULL != rtDesc) { 29 if (NULL != rtDesc) {
30 GrGLIRect vp; 30 GrGLIRect vp;
31 vp.fLeft = 0; 31 vp.fLeft = 0;
(...skipping 29 matching lines...) Expand all
61 fTexIDObj->abandon(); 61 fTexIDObj->abandon();
62 fTexIDObj.reset(NULL); 62 fTexIDObj.reset(NULL);
63 } 63 }
64 64
65 INHERITED::onAbandon(); 65 INHERITED::onAbandon();
66 } 66 }
67 67
68 GrBackendObject GrGLTexture::getTextureHandle() const { 68 GrBackendObject GrGLTexture::getTextureHandle() const {
69 return static_cast<GrBackendObject>(this->textureID()); 69 return static_cast<GrBackendObject>(this->textureID());
70 } 70 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLShaderVar.h ('k') | src/gpu/gl/GrGLUniformManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698