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

Side by Side Diff: src/gpu/GrTextureAccess.cpp

Issue 20362002: make the filter mode for GrTextureAccess an enum so we can plumb down (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fall back to mipmaps for HQ sampling (for now) 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/GrTexture.cpp ('k') | src/gpu/SkGpuDevice.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 2012 Google Inc. 2 * Copyright 2012 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 "GrTextureAccess.h" 8 #include "GrTextureAccess.h"
9 #include "GrColor.h" 9 #include "GrColor.h"
10 #include "GrTexture.h" 10 #include "GrTexture.h"
11 11
12 GrTextureAccess::GrTextureAccess() { 12 GrTextureAccess::GrTextureAccess() {
13 #if GR_DEBUG 13 #if GR_DEBUG
14 memcpy(fSwizzle, "void", 5); 14 memcpy(fSwizzle, "void", 5);
15 fSwizzleMask = 0xbeeffeed; 15 fSwizzleMask = 0xbeeffeed;
16 #endif 16 #endif
17 } 17 }
18 18
19 GrTextureAccess::GrTextureAccess(GrTexture* texture, const GrTextureParams& para ms) { 19 GrTextureAccess::GrTextureAccess(GrTexture* texture, const GrTextureParams& para ms) {
20 this->reset(texture, params); 20 this->reset(texture, params);
21 } 21 }
22 22
23 GrTextureAccess::GrTextureAccess(GrTexture* texture, 23 GrTextureAccess::GrTextureAccess(GrTexture* texture,
24 bool bilerp, 24 GrTextureParams::FilterMode filterMode,
25 SkShader::TileMode tileXAndY) { 25 SkShader::TileMode tileXAndY) {
26 this->reset(texture, bilerp, tileXAndY); 26 this->reset(texture, filterMode, tileXAndY);
27 } 27 }
28 28
29 GrTextureAccess::GrTextureAccess(GrTexture* texture, 29 GrTextureAccess::GrTextureAccess(GrTexture* texture,
30 const char* swizzle, 30 const char* swizzle,
31 const GrTextureParams& params) { 31 const GrTextureParams& params) {
32 this->reset(texture, swizzle, params); 32 this->reset(texture, swizzle, params);
33 } 33 }
34 34
35 GrTextureAccess::GrTextureAccess(GrTexture* texture, 35 GrTextureAccess::GrTextureAccess(GrTexture* texture,
36 const char* swizzle, 36 const char* swizzle,
37 bool bilerp, 37 GrTextureParams::FilterMode filterMode,
38 SkShader::TileMode tileXAndY) { 38 SkShader::TileMode tileXAndY) {
39 this->reset(texture, swizzle, bilerp, tileXAndY); 39 this->reset(texture, swizzle, filterMode, tileXAndY);
40 } 40 }
41 41
42 void GrTextureAccess::reset(GrTexture* texture, 42 void GrTextureAccess::reset(GrTexture* texture,
43 const char* swizzle, 43 const char* swizzle,
44 const GrTextureParams& params) { 44 const GrTextureParams& params) {
45 GrAssert(NULL != texture); 45 GrAssert(NULL != texture);
46 GrAssert(strlen(swizzle) >= 1 && strlen(swizzle) <= 4); 46 GrAssert(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
47 47
48 fParams = params; 48 fParams = params;
49 fTexture.reset(SkRef(texture)); 49 fTexture.reset(SkRef(texture));
50 this->setSwizzle(swizzle); 50 this->setSwizzle(swizzle);
51 } 51 }
52 52
53 void GrTextureAccess::reset(GrTexture* texture, 53 void GrTextureAccess::reset(GrTexture* texture,
54 const char* swizzle, 54 const char* swizzle,
55 bool bilerp, 55 GrTextureParams::FilterMode filterMode,
56 SkShader::TileMode tileXAndY) { 56 SkShader::TileMode tileXAndY) {
57 GrAssert(NULL != texture); 57 GrAssert(NULL != texture);
58 GrAssert(strlen(swizzle) >= 1 && strlen(swizzle) <= 4); 58 GrAssert(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
59 59
60 fParams.reset(tileXAndY, bilerp); 60 fParams.reset(tileXAndY, filterMode);
61 fTexture.reset(SkRef(texture)); 61 fTexture.reset(SkRef(texture));
62 this->setSwizzle(swizzle); 62 this->setSwizzle(swizzle);
63 } 63 }
64 64
65 void GrTextureAccess::reset(GrTexture* texture, 65 void GrTextureAccess::reset(GrTexture* texture,
66 const GrTextureParams& params) { 66 const GrTextureParams& params) {
67 GrAssert(NULL != texture); 67 GrAssert(NULL != texture);
68 fTexture.reset(SkRef(texture)); 68 fTexture.reset(SkRef(texture));
69 fParams = params; 69 fParams = params;
70 memcpy(fSwizzle, "rgba", 5); 70 memcpy(fSwizzle, "rgba", 5);
71 fSwizzleMask = kRGBA_GrColorComponentFlags; 71 fSwizzleMask = kRGBA_GrColorComponentFlags;
72 } 72 }
73 73
74 void GrTextureAccess::reset(GrTexture* texture, 74 void GrTextureAccess::reset(GrTexture* texture,
75 bool bilerp, 75 GrTextureParams::FilterMode filterMode,
76 SkShader::TileMode tileXAndY) { 76 SkShader::TileMode tileXAndY) {
77 GrAssert(NULL != texture); 77 GrAssert(NULL != texture);
78 fTexture.reset(SkRef(texture)); 78 fTexture.reset(SkRef(texture));
79 fParams.reset(tileXAndY, bilerp); 79 fParams.reset(tileXAndY, filterMode);
80 memcpy(fSwizzle, "rgba", 5); 80 memcpy(fSwizzle, "rgba", 5);
81 fSwizzleMask = kRGBA_GrColorComponentFlags; 81 fSwizzleMask = kRGBA_GrColorComponentFlags;
82 } 82 }
83 83
84 void GrTextureAccess::setSwizzle(const char* swizzle) { 84 void GrTextureAccess::setSwizzle(const char* swizzle) {
85 fSwizzleMask = 0; 85 fSwizzleMask = 0;
86 memset(fSwizzle, '\0', 5); 86 memset(fSwizzle, '\0', 5);
87 for (int i = 0; i < 4 && '\0' != swizzle[i]; ++i) { 87 for (int i = 0; i < 4 && '\0' != swizzle[i]; ++i) {
88 fSwizzle[i] = swizzle[i]; 88 fSwizzle[i] = swizzle[i];
89 switch (swizzle[i]) { 89 switch (swizzle[i]) {
90 case 'r': 90 case 'r':
91 fSwizzleMask |= kR_GrColorComponentFlag; 91 fSwizzleMask |= kR_GrColorComponentFlag;
92 break; 92 break;
93 case 'g': 93 case 'g':
94 fSwizzleMask |= kG_GrColorComponentFlag; 94 fSwizzleMask |= kG_GrColorComponentFlag;
95 break; 95 break;
96 case 'b': 96 case 'b':
97 fSwizzleMask |= kB_GrColorComponentFlag; 97 fSwizzleMask |= kB_GrColorComponentFlag;
98 break; 98 break;
99 case 'a': 99 case 'a':
100 fSwizzleMask |= kA_GrColorComponentFlag; 100 fSwizzleMask |= kA_GrColorComponentFlag;
101 break; 101 break;
102 default: 102 default:
103 GrCrash("Unexpected swizzle string character."); 103 GrCrash("Unexpected swizzle string character.");
104 break; 104 break;
105 } 105 }
106 } 106 }
107 } 107 }
OLDNEW
« no previous file with comments | « src/gpu/GrTexture.cpp ('k') | src/gpu/SkGpuDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698