| Index: src/gpu/gl/GrGLGpu.cpp
|
| diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
|
| index bf0b297c8cf064620b4ac55586c9672ff969f75c..f19802eb706565542e7d8b8f549b2565d2060dd2 100644
|
| --- a/src/gpu/gl/GrGLGpu.cpp
|
| +++ b/src/gpu/gl/GrGLGpu.cpp
|
| @@ -525,7 +525,7 @@ GrRenderTarget* GrGLGpu::onWrapBackendRenderTarget(const GrBackendRenderTargetDe
|
| case kBorrow_GrWrapOwnership:
|
| idDesc.fLifeCycle = GrGpuResource::kBorrowed_LifeCycle;
|
| break;
|
| - }
|
| + }
|
| idDesc.fSampleConfig = GrRenderTarget::kUnified_SampleConfig;
|
|
|
| GrSurfaceDesc desc;
|
| @@ -2789,7 +2789,7 @@ static inline bool can_copy_texsubimage(const GrSurface* dst,
|
| }
|
|
|
| const GrGLTexture* srcTex = static_cast<const GrGLTexture*>(src->asTexture());
|
| -
|
| +
|
| // Check that we could wrap the source in an FBO, that the dst is TEXTURE_2D, that no mirroring
|
| // is required.
|
| if (gpu->glCaps().isConfigRenderable(src->config(), src->desc().fSampleCnt > 0) &&
|
| @@ -2838,7 +2838,7 @@ void GrGLGpu::bindSurfaceFBOForCopy(GrSurface* surface, GrGLenum fboTarget, GrGL
|
| }
|
|
|
| void GrGLGpu::unbindTextureFBOForCopy(GrGLenum fboTarget, GrSurface* surface) {
|
| - // bindSurfaceFBOForCopy temporarily binds textures that are not render targets to
|
| + // bindSurfaceFBOForCopy temporarily binds textures that are not render targets to
|
| if (!surface->asRenderTarget()) {
|
| SkASSERT(surface->asTexture());
|
| GrGLenum textureTarget = static_cast<GrGLTexture*>(surface->asTexture())->target();
|
| @@ -2922,7 +2922,7 @@ bool GrGLGpu::onCopySurface(GrSurface* dst,
|
| this->copySurfaceAsDraw(dst, src, srcRect, dstPoint);
|
| return true;
|
| }
|
| -
|
| +
|
| if (can_copy_texsubimage(dst, src, this)) {
|
| this->copySurfaceAsCopyTexSubImage(dst, src, srcRect, dstPoint);
|
| return true;
|
| @@ -2973,7 +2973,7 @@ void GrGLGpu::createCopyPrograms() {
|
| vshaderTxt.append(";");
|
| vTexCoord.appendDecl(this->glCaps().glslCaps(), &vshaderTxt);
|
| vshaderTxt.append(";");
|
| -
|
| +
|
| vshaderTxt.append(
|
| "// Copy Program VS\n"
|
| "void main() {"
|
| @@ -3012,7 +3012,7 @@ void GrGLGpu::createCopyPrograms() {
|
| fsOutName,
|
| GrGLSLTexture2DFunctionName(kVec2f_GrSLType, kSamplerTypes[i], this->glslGeneration())
|
| );
|
| -
|
| +
|
| GL_CALL_RET(fCopyPrograms[i].fProgram, CreateProgram());
|
| const char* str;
|
| GrGLint length;
|
|
|