aboutsummaryrefslogtreecommitdiffhomepage
path: root/gpu/src/GrAtlas.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-04-25 15:51:06 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-04-25 15:51:06 +0000
commitfea37b5e532dfe776269253afb9951e763c3b205 (patch)
tree276a520d1cdfad17bdda4ca608bf4192138efdb7 /gpu/src/GrAtlas.cpp
parent9875dd14af6d768da8d1a4be58b98fc91ceca0dd (diff)
Add lockKeylessTexture() for caching texture without a content key.
Review URL: http://codereview.appspot.com/4440065/ git-svn-id: http://skia.googlecode.com/svn/trunk@1172 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrAtlas.cpp')
-rw-r--r--gpu/src/GrAtlas.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/src/GrAtlas.cpp b/gpu/src/GrAtlas.cpp
index dfc0a691f6..e577beb629 100644
--- a/gpu/src/GrAtlas.cpp
+++ b/gpu/src/GrAtlas.cpp
@@ -175,9 +175,9 @@ GrAtlas* GrAtlasMgr::addToAtlas(GrAtlas* atlas,
GrAssert(0 == kA8_GrMaskFormat);
GrAssert(1 == kA565_GrMaskFormat);
if (NULL == fTexture[format]) {
- GrGpu::TextureDesc desc = {
- GrGpu::kDynamicUpdate_TextureFlag,
- GrGpu::kNone_AALevel,
+ GrTextureDesc desc = {
+ kDynamicUpdate_GrTextureFlagBit,
+ kNone_GrAALevel,
GR_ATLAS_TEXTURE_WIDTH,
GR_ATLAS_TEXTURE_HEIGHT,
maskformat2pixelconfig(format)