Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: src/gpu/gl/GrGLGpu.cpp

Issue 1636873002: There is an unused rowBytes parameter being passed along. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Accidentally left in test code. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/gl/GrGLGpu.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrGLGpu.h" 8 #include "GrGLGpu.h"
9 #include "GrGLGLSL.h" 9 #include "GrGLGLSL.h"
10 #include "GrGLStencilAttachment.h" 10 #include "GrGLStencilAttachment.h"
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 desc.fWidth = wrapDesc.fWidth; 642 desc.fWidth = wrapDesc.fWidth;
643 desc.fHeight = wrapDesc.fHeight; 643 desc.fHeight = wrapDesc.fHeight;
644 desc.fSampleCnt = SkTMin(wrapDesc.fSampleCnt, this->caps()->maxSampleCount() ); 644 desc.fSampleCnt = SkTMin(wrapDesc.fSampleCnt, this->caps()->maxSampleCount() );
645 desc.fOrigin = resolve_origin(wrapDesc.fOrigin, true); 645 desc.fOrigin = resolve_origin(wrapDesc.fOrigin, true);
646 646
647 return GrGLRenderTarget::CreateWrapped(this, desc, idDesc, wrapDesc.fStencil Bits); 647 return GrGLRenderTarget::CreateWrapped(this, desc, idDesc, wrapDesc.fStencil Bits);
648 } 648 }
649 649
650 //////////////////////////////////////////////////////////////////////////////// 650 ////////////////////////////////////////////////////////////////////////////////
651 bool GrGLGpu::onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height, 651 bool GrGLGpu::onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height,
652 size_t rowBytes, GrPixelConfig srcConfig, 652 GrPixelConfig srcConfig,
653 DrawPreference* drawPreference, 653 DrawPreference* drawPreference,
654 WritePixelTempDrawInfo* tempDrawInfo) { 654 WritePixelTempDrawInfo* tempDrawInfo) {
655 if (kIndex_8_GrPixelConfig == srcConfig || GrPixelConfigIsCompressed(dstSurf ace->config())) { 655 if (kIndex_8_GrPixelConfig == srcConfig || GrPixelConfigIsCompressed(dstSurf ace->config())) {
656 return false; 656 return false;
657 } 657 }
658 658
659 // This subclass only allows writes to textures. If the dst is not a texture we have to draw 659 // This subclass only allows writes to textures. If the dst is not a texture we have to draw
660 // into it. We could use glDrawPixels on GLs that have it, but we don't toda y. 660 // into it. We could use glDrawPixels on GLs that have it, but we don't toda y.
661 if (!dstSurface->asTexture()) { 661 if (!dstSurface->asTexture()) {
662 ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference); 662 ElevateDrawPreference(drawPreference, kRequireDraw_DrawPreference);
(...skipping 3180 matching lines...) Expand 10 before | Expand all | Expand 10 after
3843 if (GR_GL_TEXTURE_EXTERNAL == glTexture->target() || 3843 if (GR_GL_TEXTURE_EXTERNAL == glTexture->target() ||
3844 GR_GL_TEXTURE_RECTANGLE == glTexture->target()) { 3844 GR_GL_TEXTURE_RECTANGLE == glTexture->target()) {
3845 copyParams->fFilter = GrTextureParams::kNone_FilterMode; 3845 copyParams->fFilter = GrTextureParams::kNone_FilterMode;
3846 copyParams->fWidth = texture->width(); 3846 copyParams->fWidth = texture->width();
3847 copyParams->fHeight = texture->height(); 3847 copyParams->fHeight = texture->height();
3848 return true; 3848 return true;
3849 } 3849 }
3850 } 3850 }
3851 return false; 3851 return false;
3852 } 3852 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGpu.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698