diff options
| author |  bsalomon <bsalomon@google.com> | 2014-10-28 14:33:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-28 14:33:06 -0700 |
| commit | f2703d83da3ab2ae18b45231fd4f11e16cce3184 (patch) | |
| tree | 296ec36a08899623dc5808190600f14e08c24107 /gm | |
| parent | 0ec28af1a7259ef0deec44bd3cba74aafc3c2ad1 (diff) | |
rename GrTextureDesc->GrSurfaceDesc, GrTextureFlags->GrSurfaceFlags
Review URL: https://codereview.chromium.org/682223002
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/gmmain.cpp | 4 | ||||
| -rw-r--r-- | gm/texdata.cpp | 6 | ||||
| -rw-r--r-- | gm/xfermodes3.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp index cb7816b6a4..da0f38f4e3 100644 --- a/gm/gmmain.cpp +++ b/gm/gmmain.cpp @@ -1759,9 +1759,9 @@ ErrorCombination run_multiple_configs(GMMain &gmmain, GM *gm, bool grSuccess = false; if (gr) { // create a render target to back the device - GrTextureDesc desc; + GrSurfaceDesc desc; desc.fConfig = kSkia8888_GrPixelConfig; - desc.fFlags = kRenderTarget_GrTextureFlagBit; + desc.fFlags = kRenderTarget_GrSurfaceFlag; desc.fWidth = gm->getISize().width(); desc.fHeight = gm->getISize().height(); desc.fSampleCnt = config.fSampleCnt; diff --git a/gm/texdata.cpp b/gm/texdata.cpp index b979df72ff..efe8c4d730 100644 --- a/gm/texdata.cpp +++ b/gm/texdata.cpp @@ -78,10 +78,10 @@ protected: } } - GrTextureDesc desc; + GrSurfaceDesc desc; // use RT flag bit because in GL it makes the texture be bottom-up - desc.fFlags = i ? kRenderTarget_GrTextureFlagBit : - kNone_GrTextureFlags; + desc.fFlags = i ? kRenderTarget_GrSurfaceFlag : + kNone_GrSurfaceFlags; desc.fConfig = kSkia8888_GrPixelConfig; desc.fWidth = 2 * S; desc.fHeight = 2 * S; diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index 1ca740893b..b12004ba54 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -126,11 +126,11 @@ private: #if SK_SUPPORT_GPU GrContext* context = baseCanvas->getGrContext(); if (context) { - GrTextureDesc desc; + GrSurfaceDesc desc; desc.fWidth = w; desc.fHeight = h; desc.fConfig = SkImageInfo2GrPixelConfig(baseCanvas->imageInfo()); - desc.fFlags = kRenderTarget_GrTextureFlagBit; + desc.fFlags = kRenderTarget_GrSurfaceFlag; SkAutoTUnref<GrSurface> surface(context->createUncachedTexture(desc, NULL, 0)); SkAutoTUnref<SkBaseDevice> device(SkGpuDevice::Create(surface.get(), SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType))); |