diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-25 18:43:28 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-25 18:43:28 +0000 |
| commit | 16e3ddea6a80972aced04b21b1d66377fa95e7c7 (patch) | |
| tree | 2dffbddbfa9f09ac89ca0ebbb5f79e77d5516c78 /src/gpu/gl | |
| parent | b5a5a9dc755a1655007ca05b2cc279773f3623ba (diff) | |
Platform/Engine -> Backend
createPlatform -> wrapBackend
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6785044
git-svn-id: http://skia.googlecode.com/svn/trunk@6123 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 10 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL.h | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 7a58c53aef..62652f8b91 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -476,13 +476,13 @@ void GrGpuGL::onResetContext() { fHWConstAttribCoverage = GrColor_ILLEGAL; } -GrTexture* GrGpuGL::onCreatePlatformTexture(const GrPlatformTextureDesc& desc) { +GrTexture* GrGpuGL::onWrapBackendTexture(const GrBackendTextureDesc& desc) { GrGLTexture::Desc glTexDesc; - if (!configToGLFormats(desc.fConfig, false, NULL, NULL, NULL)) { + if (!this->configToGLFormats(desc.fConfig, false, NULL, NULL, NULL)) { return NULL; } - // next line relies on PlatformTextureDesc's flags matching GrTexture's + // next line relies on GrBackendTextureDesc's flags matching GrTexture's glTexDesc.fFlags = (GrTextureFlags) desc.fFlags; glTexDesc.fWidth = desc.fWidth; glTexDesc.fHeight = desc.fHeight; @@ -493,7 +493,7 @@ GrTexture* GrGpuGL::onCreatePlatformTexture(const GrPlatformTextureDesc& desc) { glTexDesc.fOrientation = GrGLTexture::kBottomUp_Orientation; GrGLTexture* texture = NULL; - if (desc.fFlags & kRenderTarget_GrPlatformTextureFlag) { + if (desc.fFlags & kRenderTarget_GrBackendTextureFlag) { GrGLRenderTarget::Desc glRTDesc; glRTDesc.fRTFBOID = 0; glRTDesc.fTexFBOID = 0; @@ -519,7 +519,7 @@ GrTexture* GrGpuGL::onCreatePlatformTexture(const GrPlatformTextureDesc& desc) { return texture; } -GrRenderTarget* GrGpuGL::onCreatePlatformRenderTarget(const GrPlatformRenderTargetDesc& desc) { +GrRenderTarget* GrGpuGL::onWrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) { GrGLRenderTarget::Desc glDesc; glDesc.fConfig = desc.fConfig; glDesc.fRTFBOID = static_cast<GrGLuint>(desc.fRenderTargetHandle); diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h index 0cd7eb58a0..0f7b8160e7 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGpuGL.h @@ -66,10 +66,8 @@ protected: virtual GrIndexBuffer* onCreateIndexBuffer(uint32_t size, bool dynamic) SK_OVERRIDE; virtual GrPath* onCreatePath(const SkPath&) SK_OVERRIDE; - virtual GrTexture* onCreatePlatformTexture( - const GrPlatformTextureDesc& desc) SK_OVERRIDE; - virtual GrRenderTarget* onCreatePlatformRenderTarget( - const GrPlatformRenderTargetDesc& desc) SK_OVERRIDE; + virtual GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&) SK_OVERRIDE; + virtual GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&) SK_OVERRIDE; virtual bool createStencilBufferForRenderTarget(GrRenderTarget* rt, int width, int height) SK_OVERRIDE; |