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

Side by Side Diff: include/gpu/gl/GrGLFunctions.h

Issue 149533002: Cleanup GrGLInterface after Chromium changes (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebasE Created 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | include/gpu/gl/GrGLInterface.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 2012 Google Inc. 3 * Copyright 2012 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 #ifndef GrGLFunctions_DEFINED 9 #ifndef GrGLFunctions_DEFINED
10 #define GrGLFunctions_DEFINED 10 #define GrGLFunctions_DEFINED
11 11
12 #include "GrGLConfig.h" 12 #include "GrGLConfig.h"
13 13
14 //////////////////////////////////////////////////////////////////////////////// 14 ////////////////////////////////////////////////////////////////////////////////
15 15
16 /** 16 /**
17 * Classifies GL contexts by which standard they implement (currently as Desktop 17 * Classifies GL contexts by which standard they implement (currently as Desktop
18 * vs. ES). 18 * vs. ES).
19 */ 19 */
20 enum GrGLStandard { 20 enum GrGLStandard {
21 kNone_GrGLStandard, 21 kNone_GrGLStandard,
22 kGL_GrGLStandard, 22 kGL_GrGLStandard,
23 kGLES_GrGLStandard, 23 kGLES_GrGLStandard,
24 }; 24 };
25 25
26 // Temporary aliases until Chromium can be updated.
27 typedef GrGLStandard GrGLBinding;
28 static const GrGLStandard kES2_GrGLBinding = kGLES_GrGLStandard;
29 static const GrGLStandard kDesktop_GrGLBinding = kGL_GrGLStandard;
30
31 /////////////////////////////////////////////////////////////////////////////// 26 ///////////////////////////////////////////////////////////////////////////////
32 27
33 /** 28 /**
34 * Declares typedefs for all the GL functions used in GrGLInterface 29 * Declares typedefs for all the GL functions used in GrGLInterface
35 */ 30 */
36 31
37 typedef unsigned int GrGLenum; 32 typedef unsigned int GrGLenum;
38 typedef unsigned char GrGLboolean; 33 typedef unsigned char GrGLboolean;
39 typedef unsigned int GrGLbitfield; 34 typedef unsigned int GrGLbitfield;
40 typedef signed char GrGLbyte; 35 typedef signed char GrGLbyte;
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetPathTexGenivProc)(GrGLenum tex CoordSet, GrGLenum pname, GrGLint *value); 253 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetPathTexGenivProc)(GrGLenum tex CoordSet, GrGLenum pname, GrGLint *value);
259 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetPathTexGenfvProc)(GrGLenum tex CoordSet, GrGLenum pname, GrGLfloat *value); 254 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GrGLGetPathTexGenfvProc)(GrGLenum tex CoordSet, GrGLenum pname, GrGLfloat *value);
260 typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsPointInFillPathProc)(GrGLuin t path, GrGLuint mask, GrGLfloat x, GrGLfloat y); 255 typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsPointInFillPathProc)(GrGLuin t path, GrGLuint mask, GrGLfloat x, GrGLfloat y);
261 typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsPointInStrokePathProc)(GrGLu int path, GrGLfloat x, GrGLfloat y); 256 typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLIsPointInStrokePathProc)(GrGLu int path, GrGLfloat x, GrGLfloat y);
262 typedef GrGLfloat (GR_GL_FUNCTION_TYPE* GrGLGetPathLengthProc)(GrGLuint path , GrGLsizei startSegment, GrGLsizei numSegments); 257 typedef GrGLfloat (GR_GL_FUNCTION_TYPE* GrGLGetPathLengthProc)(GrGLuint path , GrGLsizei startSegment, GrGLsizei numSegments);
263 typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLPointAlongPathProc)(GrGLuint p ath, GrGLsizei startSegment, GrGLsizei numSegments, GrGLfloat distance, GrGLfloa t *x, GrGLfloat *y, GrGLfloat *tangentX, GrGLfloat *tangentY); 258 typedef GrGLboolean (GR_GL_FUNCTION_TYPE* GrGLPointAlongPathProc)(GrGLuint p ath, GrGLsizei startSegment, GrGLsizei numSegments, GrGLfloat distance, GrGLfloa t *x, GrGLfloat *y, GrGLfloat *tangentX, GrGLfloat *tangentY);
264 259
265 } // extern "C" 260 } // extern "C"
266 261
267 #endif 262 #endif
OLDNEW
« no previous file with comments | « no previous file | include/gpu/gl/GrGLInterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698