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

Side by Side Diff: gpu/GLES2/gl2.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
« no previous file with comments | « gpu/EGL/eglext.h ('k') | gpu/GLES2/gl2ext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 #ifndef __gl2_h_ 1 #ifndef __gl2_h_
2 #define __gl2_h_ 2 #define __gl2_h_
3 3
4 /* $Revision: 8784 $ on $Date:: 2009-09-02 09:49:17 -0700 #$ */ 4 /* $Revision: 8784 $ on $Date:: 2009-09-02 09:49:17 -0700 #$ */
5 5
6 #include <GLES2/gl2platform.h> 6 #include <GLES2/gl2platform.h>
7 7
8 /* 8 /*
9 * This document is licensed under the SGI Free Software B License Version 9 * This document is licensed under the SGI Free Software B License Version
10 * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . 10 * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); 784 GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
785 785
786 #if defined(__cplusplus) 786 #if defined(__cplusplus)
787 } 787 }
788 #endif 788 #endif
789 789
790 #endif // !GLES2_USE_CPP_BINDINGS 790 #endif // !GLES2_USE_CPP_BINDINGS
791 791
792 #endif /* __gl2_h_ */ 792 #endif /* __gl2_h_ */
793 793
OLDNEW
« no previous file with comments | « gpu/EGL/eglext.h ('k') | gpu/GLES2/gl2ext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698