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

Side by Side Diff: include/gpu/GrConfig.h

Issue 553583008: Add counting of some GL calls (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Update for merge conflict Created 6 years, 3 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 | « no previous file | include/gpu/GrContext.h » ('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 /* 2 /*
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 10
(...skipping 18 matching lines...) Expand all
29 #endif 29 #endif
30 30
31 /** 31 /**
32 * Gr defines are set to 0 or 1, rather than being undefined or defined 32 * Gr defines are set to 0 or 1, rather than being undefined or defined
33 */ 33 */
34 34
35 #if !defined(GR_CACHE_STATS) 35 #if !defined(GR_CACHE_STATS)
36 #define GR_CACHE_STATS 0 36 #define GR_CACHE_STATS 0
37 #endif 37 #endif
38 38
39 #if !defined(GR_GPU_STATS)
40 #define GR_GPU_STATS 0
41 #endif
42
39 /////////////////////////////////////////////////////////////////////////////// 43 ///////////////////////////////////////////////////////////////////////////////
40 /////////////////////////////////////////////////////////////////////////////// 44 ///////////////////////////////////////////////////////////////////////////////
41 45
42 #if defined(SK_BUILD_FOR_WIN32) 46 #if defined(SK_BUILD_FOR_WIN32)
43 // VC8 doesn't support stdint.h, so we define those types here. 47 // VC8 doesn't support stdint.h, so we define those types here.
44 typedef signed char int8_t; 48 typedef signed char int8_t;
45 typedef unsigned char uint8_t; 49 typedef unsigned char uint8_t;
46 typedef short int16_t; 50 typedef short int16_t;
47 typedef unsigned short uint16_t; 51 typedef unsigned short uint16_t;
48 typedef int int32_t; 52 typedef int int32_t;
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 * allocated on the stack for smaller memory requests. 242 * allocated on the stack for smaller memory requests.
239 * 243 *
240 * This is only used for memory buffers that are created and then passed through to the 244 * This is only used for memory buffers that are created and then passed through to the
241 * 3D API (e.g. as texture or geometry data) 245 * 3D API (e.g. as texture or geometry data)
242 */ 246 */
243 #if !defined(GR_ALWAYS_ALLOCATE_ON_HEAP) 247 #if !defined(GR_ALWAYS_ALLOCATE_ON_HEAP)
244 #define GR_ALWAYS_ALLOCATE_ON_HEAP 0 248 #define GR_ALWAYS_ALLOCATE_ON_HEAP 0
245 #endif 249 #endif
246 250
247 #endif 251 #endif
OLDNEW
« no previous file with comments | « no previous file | include/gpu/GrContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698