gpu/GLES2/gl2platform.h - Issue 8633020: Revert 111170 - Move GL headers from gpu to third_party/khronos

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: gpu/GLES2/gl2platform.h

Issue 8633020: Revert 111170 - Move GL headers from gpu to third_party/khronos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years 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

Property Changes:

Added: svn:mergeinfo

« no previous file with comments | « gpu/GLES2/gl2ext.h ('k') | gpu/KHR/khrplatform.h » ('j') | no next file with comments »

OLD	NEW
1 #ifndef __gl2platform_h_	1 #ifndef __gl2platform_h_

2 #define __gl2platform_h_	2 #define __gl2platform_h_

3	3

4 /* $Revision: 7173 $ on $Date:: 2009-01-09 11:18:21 -0800 #$ */	4 /* $Revision: 7173 $ on $Date:: 2009-01-09 11:18:21 -0800 #$ */

5	5

6 /*	6 /*

7 * This document is licensed under the SGI Free Software B License Version	7 * This document is licensed under the SGI Free Software B License Version

8 * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .	8 * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .

9 */	9 */

10	10

11 /* Platform-specific types and definitions for OpenGL ES 2.X gl2.h	11 /* Platform-specific types and definitions for OpenGL ES 2.X gl2.h

12 * Last modified on 2008/12/19	12 * Last modified on 2008/12/19

13 *	13 *

14 * Adopters may modify khrplatform.h and this file to suit their platform.	14 * Adopters may modify khrplatform.h and this file to suit their platform.

15 * You are encouraged to submit all modifications to the Khronos group so that	15 * You are encouraged to submit all modifications to the Khronos group so that

16 * they can be included in future versions of this file. Please submit changes	16 * they can be included in future versions of this file. Please submit changes

17 * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)	17 * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)

18 * by filing a bug against product "OpenGL-ES" component "Registry".	18 * by filing a bug against product "OpenGL-ES" component "Registry".

19 */	19 */

20	20

21 #include <KHR/khrplatform.h>	21 #include <KHR/khrplatform.h>

22	22

23 #ifndef GL_APICALL	23 #ifndef GL_APICALL

24 #define GL_APICALL KHRONOS_APICALL	24 #define GL_APICALL KHRONOS_APICALL

25 #endif	25 #endif

26	26

27 #define GL_APIENTRY KHRONOS_APIENTRY	27 #define GL_APIENTRY KHRONOS_APIENTRY

28	28

29 #endif /* __gl2platform_h_ */	29 #endif /* __gl2platform_h_ */

OLD	NEW