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

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

Issue 1666503002: Revert of Move Google3-specific stack limitation logic to template classes. Remove #ifdefs in other files. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: 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/batches/GrDrawPathBatch.cpp ('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 8
9 #include "GrGLGpu.h" 9 #include "GrGLGpu.h"
10 #include "GrGLGLSL.h" 10 #include "GrGLGLSL.h"
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 SkASSERT(this->caps()->isConfigTexturable(desc.fConfig)); 850 SkASSERT(this->caps()->isConfigTexturable(desc.fConfig));
851 851
852 size_t bpp = GrBytesPerPixel(dataConfig); 852 size_t bpp = GrBytesPerPixel(dataConfig);
853 if (!GrSurfacePriv::AdjustWritePixelParams(desc.fWidth, desc.fHeight, bpp, & left, &top, 853 if (!GrSurfacePriv::AdjustWritePixelParams(desc.fWidth, desc.fHeight, bpp, & left, &top,
854 &width, &height, &dataOrOffset, & rowBytes)) { 854 &width, &height, &dataOrOffset, & rowBytes)) {
855 return false; 855 return false;
856 } 856 }
857 size_t trimRowBytes = width * bpp; 857 size_t trimRowBytes = width * bpp;
858 858
859 // in case we need a temporary, trimmed copy of the src pixels 859 // in case we need a temporary, trimmed copy of the src pixels
860 #if defined(GOOGLE3)
861 // Stack frame size is limited in GOOGLE3.
862 SkAutoSMalloc<64 * 128> tempStorage;
863 #else
860 SkAutoSMalloc<128 * 128> tempStorage; 864 SkAutoSMalloc<128 * 128> tempStorage;
865 #endif
861 866
862 // Internal format comes from the texture desc. 867 // Internal format comes from the texture desc.
863 GrGLenum internalFormat; 868 GrGLenum internalFormat;
864 // External format and type come from the upload data. 869 // External format and type come from the upload data.
865 GrGLenum externalFormat; 870 GrGLenum externalFormat;
866 GrGLenum externalType; 871 GrGLenum externalType;
867 if (!this->glCaps().getTexImageFormats(desc.fConfig, dataConfig, &internalFo rmat, 872 if (!this->glCaps().getTexImageFormats(desc.fConfig, dataConfig, &internalFo rmat,
868 &externalFormat, &externalType)) { 873 &externalFormat, &externalType)) {
869 return false; 874 return false;
870 } 875 }
(...skipping 2948 matching lines...) Expand 10 before | Expand all | Expand 10 after
3819 if (GR_GL_TEXTURE_EXTERNAL == glTexture->target() || 3824 if (GR_GL_TEXTURE_EXTERNAL == glTexture->target() ||
3820 GR_GL_TEXTURE_RECTANGLE == glTexture->target()) { 3825 GR_GL_TEXTURE_RECTANGLE == glTexture->target()) {
3821 copyParams->fFilter = GrTextureParams::kNone_FilterMode; 3826 copyParams->fFilter = GrTextureParams::kNone_FilterMode;
3822 copyParams->fWidth = texture->width(); 3827 copyParams->fWidth = texture->width();
3823 copyParams->fHeight = texture->height(); 3828 copyParams->fHeight = texture->height();
3824 return true; 3829 return true;
3825 } 3830 }
3826 } 3831 }
3827 return false; 3832 return false;
3828 } 3833 }
OLDNEW
« no previous file with comments | « src/gpu/batches/GrDrawPathBatch.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698