aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGpuGL.cpp
diff options
context:
space:
mode:
authorGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-07 12:08:45 +0000
committerGravatar robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-07 12:08:45 +0000
commit75b3c9633cb9a594dab0ccf51dab1e694c149a18 (patch)
treeec4669cda6d54e286bf9b92f6495d733cfd58033 /src/gpu/gl/GrGpuGL.cpp
parent93b4375fd4d87d3502d14d5e6a98383993b2600c (diff)
Move clientID into texture desc
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
-rw-r--r--src/gpu/gl/GrGpuGL.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index d5c0bd2ed6..da168cda13 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -375,7 +375,6 @@ bool GrGpuGL::canPreserveReadWriteUnpremulPixels() {
dstDesc.fWidth = 256;
dstDesc.fHeight = 256;
dstDesc.fConfig = kRGBA_8888_PM_GrPixelConfig;
- dstDesc.fSampleCnt = 0;
SkAutoTUnref<GrTexture> dstTex(this->createTexture(dstDesc, NULL, 0));
if (!dstTex.get()) {
@@ -1015,6 +1014,7 @@ GrTexture* GrGpuGL::onCreateTexture(const GrTextureDesc& desc,
glTexDesc.fHeight = desc.fHeight;
glTexDesc.fConfig = desc.fConfig;
glTexDesc.fSampleCnt = desc.fSampleCnt;
+ glTexDesc.fClientCacheID = desc.fClientCacheID;
glTexDesc.fOwnsID = true;