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

Side by Side Diff: src/gpu/gl/builders/GrGLProgramBuilder.cpp

Issue 1002623004: Move GrAutoLocaleSetter to new file and fix issue with null locale (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: remove extra newline Created 5 years, 9 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/GrAutoLocaleSetter.h ('k') | tests/GLProgramsTest.cpp » ('j') | 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 2014 Google Inc. 2 * Copyright 2014 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 "GrGLProgramBuilder.h" 8 #include "GrGLProgramBuilder.h"
9 9
10 #include "gl/GrGLGeometryProcessor.h" 10 #include "gl/GrGLGeometryProcessor.h"
11 #include "gl/GrGLGpu.h" 11 #include "gl/GrGLGpu.h"
12 #include "gl/GrGLPathProcessor.h" 12 #include "gl/GrGLPathProcessor.h"
13 #include "gl/GrGLProgram.h" 13 #include "gl/GrGLProgram.h"
14 #include "gl/GrGLSLPrettyPrint.h" 14 #include "gl/GrGLSLPrettyPrint.h"
15 #include "gl/GrGLUniformHandle.h" 15 #include "gl/GrGLUniformHandle.h"
16 #include "gl/GrGLXferProcessor.h" 16 #include "gl/GrGLXferProcessor.h"
17 #include "GrAutoLocaleSetter.h"
17 #include "GrCoordTransform.h" 18 #include "GrCoordTransform.h"
18 #include "GrGLProgramBuilder.h" 19 #include "GrGLProgramBuilder.h"
19 #include "GrTexture.h" 20 #include "GrTexture.h"
20 #include "SkRTConf.h" 21 #include "SkRTConf.h"
21 #include "SkTraceEvent.h" 22 #include "SkTraceEvent.h"
22 23
23 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X) 24 #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X)
24 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X) 25 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X)
25 26
26 //////////////////////////////////////////////////////////////////////////////// /////////////////// 27 //////////////////////////////////////////////////////////////////////////////// ///////////////////
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 } 496 }
496 497
497 //////////////////////////////////////////////////////////////////////////////// /////////////////// 498 //////////////////////////////////////////////////////////////////////////////// ///////////////////
498 499
499 GrGLInstalledFragProcs::~GrGLInstalledFragProcs() { 500 GrGLInstalledFragProcs::~GrGLInstalledFragProcs() {
500 int numProcs = fProcs.count(); 501 int numProcs = fProcs.count();
501 for (int e = 0; e < numProcs; ++e) { 502 for (int e = 0; e < numProcs; ++e) {
502 SkDELETE(fProcs[e]); 503 SkDELETE(fProcs[e]);
503 } 504 }
504 } 505 }
OLDNEW
« no previous file with comments | « src/gpu/GrAutoLocaleSetter.h ('k') | tests/GLProgramsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698