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

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

Issue 846303002: Make uncached textures uncached from the get go. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Add comment Created 5 years, 11 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/GrGLTexture.h ('k') | src/gpu/gl/GrGLTextureRenderTarget.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 "GrGLGpu.h" 9 #include "GrGLGpu.h"
10 10
11 #define GPUGL static_cast<GrGLGpu*>(this->getGpu()) 11 #define GPUGL static_cast<GrGLGpu*>(this->getGpu())
12 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) 12 #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
13 13
14 // Because this class is virtually derived from GrSurface we must explicitly cal l its constructor. 14 // Because this class is virtually derived from GrSurface we must explicitly cal l its constructor.
15 GrGLTexture::GrGLTexture(GrGLGpu* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc) 15 GrGLTexture::GrGLTexture(GrGLGpu* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc)
16 : GrSurface(gpu, idDesc.fIsWrapped, desc) 16 : GrSurface(gpu, idDesc.fLifeCycle, desc)
17 , INHERITED(gpu, idDesc.fIsWrapped, desc) { 17 , INHERITED(gpu, idDesc.fLifeCycle, desc) {
18 this->init(desc, idDesc); 18 this->init(desc, idDesc);
19 this->registerWithCache(); 19 this->registerWithCache();
20 } 20 }
21 21
22 GrGLTexture::GrGLTexture(GrGLGpu* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc, Derived) 22 GrGLTexture::GrGLTexture(GrGLGpu* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc, Derived)
23 : GrSurface(gpu, idDesc.fIsWrapped, desc) 23 : GrSurface(gpu, idDesc.fLifeCycle, desc)
24 , INHERITED(gpu, idDesc.fIsWrapped, desc) { 24 , INHERITED(gpu, idDesc.fLifeCycle, desc) {
25 this->init(desc, idDesc); 25 this->init(desc, idDesc);
26 } 26 }
27 27
28 void GrGLTexture::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) { 28 void GrGLTexture::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) {
29 SkASSERT(0 != idDesc.fTextureID); 29 SkASSERT(0 != idDesc.fTextureID);
30 fTexParams.invalidate(); 30 fTexParams.invalidate();
31 fTexParamsTimestamp = GrGpu::kExpiredTimestamp; 31 fTexParamsTimestamp = GrGpu::kExpiredTimestamp;
32 fTextureID = idDesc.fTextureID; 32 fTextureID = idDesc.fTextureID;
33 fIsWrapped = idDesc.fIsWrapped; 33 fIsWrapped = kWrapped_LifeCycle == idDesc.fLifeCycle;
34 } 34 }
35 35
36 void GrGLTexture::onRelease() { 36 void GrGLTexture::onRelease() {
37 if (fTextureID) { 37 if (fTextureID) {
38 if (!fIsWrapped) { 38 if (!fIsWrapped) {
39 GL_CALL(DeleteTextures(1, &fTextureID)); 39 GL_CALL(DeleteTextures(1, &fTextureID));
40 } 40 }
41 fTextureID = 0; 41 fTextureID = 0;
42 fIsWrapped = false; 42 fIsWrapped = false;
43 } 43 }
44 INHERITED::onRelease(); 44 INHERITED::onRelease();
45 } 45 }
46 46
47 void GrGLTexture::onAbandon() { 47 void GrGLTexture::onAbandon() {
48 fTextureID = 0; 48 fTextureID = 0;
49 fIsWrapped = false; 49 fIsWrapped = false;
50 INHERITED::onAbandon(); 50 INHERITED::onAbandon();
51 } 51 }
52 52
53 GrBackendObject GrGLTexture::getTextureHandle() const { 53 GrBackendObject GrGLTexture::getTextureHandle() const {
54 return static_cast<GrBackendObject>(this->textureID()); 54 return static_cast<GrBackendObject>(this->textureID());
55 } 55 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLTexture.h ('k') | src/gpu/gl/GrGLTextureRenderTarget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698