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

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

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 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/GrBatch.h ('k') | src/lazy/SkDiscardableMemoryPool.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 2013 Google Inc. 2 * Copyright 2013 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 "GrGLNoOpInterface.h" 8 #include "GrGLNoOpInterface.h"
9 #include "SkMutex.h"
10 #include "SkString.h" 9 #include "SkString.h"
10 #include "SkThread.h"
11 11
12 // the OpenGLES 2.0 spec says this must be >= 128 12 // the OpenGLES 2.0 spec says this must be >= 128
13 static const GrGLint kDefaultMaxVertexUniformVectors = 128; 13 static const GrGLint kDefaultMaxVertexUniformVectors = 128;
14 14
15 // the OpenGLES 2.0 spec says this must be >=16 15 // the OpenGLES 2.0 spec says this must be >=16
16 static const GrGLint kDefaultMaxFragmentUniformVectors = 16; 16 static const GrGLint kDefaultMaxFragmentUniformVectors = 16;
17 17
18 // the OpenGLES 2.0 spec says this must be >= 8 18 // the OpenGLES 2.0 spec says this must be >= 8
19 static const GrGLint kDefaultMaxVertexAttribs = 8; 19 static const GrGLint kDefaultMaxVertexAttribs = 8;
20 20
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 static int gUniLocation = 0; 673 static int gUniLocation = 0;
674 return ++gUniLocation; 674 return ++gUniLocation;
675 } 675 }
676 676
677 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLInsertEventMarker(GrGLsizei length, const cha r* marker) { 677 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLInsertEventMarker(GrGLsizei length, const cha r* marker) {
678 } 678 }
679 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPushGroupMarker(GrGLsizei length , const cha r* marker) { 679 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPushGroupMarker(GrGLsizei length , const cha r* marker) {
680 } 680 }
681 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPopGroupMarker() { 681 GrGLvoid GR_GL_FUNCTION_TYPE noOpGLPopGroupMarker() {
682 } 682 }
OLDNEW
« no previous file with comments | « src/gpu/GrBatch.h ('k') | src/lazy/SkDiscardableMemoryPool.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698