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

Side by Side Diff: third_party/mesa/MesaLib/include/GL/gl.h

Issue 4107001: Upgraded Mesa to 7.9 from 7.7 in order to pick up bug fixes to the... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « chrome/gpu/gpu_main.cc ('k') | third_party/mesa/MesaLib/include/GL/glext.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 * Mesa 3-D graphics library 2 * Mesa 3-D graphics library
3 * Version: 7.6 3 * Version: 7.6
4 * 4 *
5 * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. 5 * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
6 * Copyright (C) 2009 VMware, Inc. All Rights Reserved. 6 * Copyright (C) 2009 VMware, Inc. All Rights Reserved.
7 * 7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a 8 * Permission is hereby granted, free of charge, to any person obtaining a
9 * copy of this software and associated documentation files (the "Software"), 9 * copy of this software and associated documentation files (the "Software"),
10 * to deal in the Software without restriction, including without limitation 10 * to deal in the Software without restriction, including without limitation
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 # define GLAPI extern 64 # define GLAPI extern
65 # endif /* _STATIC_MESA support */ 65 # endif /* _STATIC_MESA support */
66 # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* Th e generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ 66 # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* Th e generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
67 # define GLAPIENTRY 67 # define GLAPIENTRY
68 # else 68 # else
69 # define GLAPIENTRY __stdcall 69 # define GLAPIENTRY __stdcall
70 # endif 70 # endif
71 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl3 2 */ 71 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl3 2 */
72 # define GLAPI extern 72 # define GLAPI extern
73 # define GLAPIENTRY __stdcall 73 # define GLAPIENTRY __stdcall
74 #elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 74 #elif defined(__GNUC__)»|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
75 # define GLAPI __attribute__((visibility("default"))) 75 # define GLAPI __attribute__((visibility("default")))
76 # define GLAPIENTRY 76 # define GLAPIENTRY
77 #endif /* WIN32 && !CYGWIN */ 77 #endif /* WIN32 && !CYGWIN */
78 78
79 // Disabled this because __QUICKDRAW__ is defined on Mac and gcc does not 79 // Disabled this because __QUICKDRAW__ is defined on Mac and gcc does not
80 // support the pragma. 80 // support the pragma.
81 //#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) 81 //#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
82 //# define PRAGMA_EXPORT_SUPPORTED 1 82 //# define PRAGMA_EXPORT_SUPPORTED 1
83 //#endif 83 //#endif
84 84
85 /* 85 /*
86 * WINDOWS: Include windows.h here to define APIENTRY. 86 * WINDOWS: Include windows.h here to define APIENTRY.
87 * It is also useful when applications include this file by 87 * It is also useful when applications include this file by
88 * including only glut.h, since glut.h depends on windows.h. 88 * including only glut.h, since glut.h depends on windows.h.
89 * Applications needing to include windows.h with parms other 89 * Applications needing to include windows.h with parms other
90 * than "WIN32_LEAN_AND_MEAN" may include windows.h before 90 * than "WIN32_LEAN_AND_MEAN" may include windows.h before
91 * glut.h or gl.h. 91 * glut.h or gl.h.
92 */ 92 */
93 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) 93 #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
94 #ifndef WIN32_LEAN_AND_MEAN
94 #define WIN32_LEAN_AND_MEAN 1 95 #define WIN32_LEAN_AND_MEAN 1
96 #endif
95 #include <windows.h> 97 #include <windows.h>
96 #endif 98 #endif
97 99
98 #if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WIN32_WCE) \ 100 #if defined(_WIN32) && !defined(_WINGDI_) && !defined(_WIN32_WCE) \
99 && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) \ 101 && !defined(_GNU_H_WINDOWS32_DEFINES) && !defined(OPENSTEP) \
100 && !defined(__CYGWIN__) || defined(__MINGW32__) 102 && !defined(__CYGWIN__) || defined(__MINGW32__)
101 #include <GL/mesa_wgl.h> 103 #include <GL/mesa_wgl.h>
102 #endif 104 #endif
103 105
104 #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED 106 #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
(...skipping 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 #define GL_ATI_blend_equation_separate 1 2194 #define GL_ATI_blend_equation_separate 1
2193 2195
2194 #define GL_ALPHA_BLEND_EQUATION_ATI 0x883D 2196 #define GL_ALPHA_BLEND_EQUATION_ATI 0x883D
2195 2197
2196 GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA ) ; 2198 GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA ) ;
2197 typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen um modeA); 2199 typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen um modeA);
2198 2200
2199 #endif /* GL_ATI_blend_equation_separate */ 2201 #endif /* GL_ATI_blend_equation_separate */
2200 2202
2201 2203
2204 /* GL_OES_EGL_image */
2205 #ifndef GL_OES_EGL_image
2206 typedef void* GLeglImageOES;
2207 #endif
2208
2209 #ifndef GL_OES_EGL_image
2210 #define GL_OES_EGL_image 1
2211 #ifdef GL_GLEXT_PROTOTYPES
2212 GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES i mage);
2213 GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLegl ImageOES image);
2214 #endif
2215 typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLe glImageOES image);
2216 typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t arget, GLeglImageOES image);
2217 #endif
2218
2202 2219
2203 /** 2220 /**
2204 ** NOTE!!!!! If you add new functions to this file, or update 2221 ** NOTE!!!!! If you add new functions to this file, or update
2205 ** glext.h be sure to regenerate the gl_mangle.h file. See comments 2222 ** glext.h be sure to regenerate the gl_mangle.h file. See comments
2206 ** in that file for details. 2223 ** in that file for details.
2207 **/ 2224 **/
2208 2225
2209 2226
2210 2227
2211 /********************************************************************** 2228 /**********************************************************************
2212 * Begin system-specific stuff 2229 * Begin system-specific stuff
2213 */ 2230 */
2214 #if defined(PRAGMA_EXPORT_SUPPORTED) 2231 #if defined(PRAGMA_EXPORT_SUPPORTED)
2215 #pragma export off 2232 #pragma export off
2216 #endif 2233 #endif
2217 2234
2218 #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED 2235 #if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
2219 #pragma import off 2236 #pragma import off
2220 #endif 2237 #endif
2221 /* 2238 /*
2222 * End system-specific stuff 2239 * End system-specific stuff
2223 **********************************************************************/ 2240 **********************************************************************/
2224 2241
2225 2242
2226 #ifdef __cplusplus 2243 #ifdef __cplusplus
2227 } 2244 }
2228 #endif 2245 #endif
2229 2246
2230 #endif /* __gl_h_ */ 2247 #endif /* __gl_h_ */
OLDNEW
« no previous file with comments | « chrome/gpu/gpu_main.cc ('k') | third_party/mesa/MesaLib/include/GL/glext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698