Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 692206 | Differences between
and this patch

Collapse All | Expand All

(-)libglvnd-1.2.0/include/GL/gl.h (-130 / +17 lines)
Lines 27-66 Link Here
27
#ifndef __gl_h_
27
#ifndef __gl_h_
28
#define __gl_h_
28
#define __gl_h_
29
29
30
#if defined(USE_MGL_NAMESPACE)
31
#include "gl_mangle.h"
32
#endif
33
34
35
/**********************************************************************
30
/**********************************************************************
36
 * Begin system-specific stuff. Do not do any of this when building
31
 * Begin system-specific stuff.
37
 * for SciTech SNAP, as this is all done before this header file is
38
 * included. 
39
 */
32
 */
40
#if !defined(__SCITECH_SNAP__)
41
42
#if defined(__BEOS__)
43
#include <stdlib.h>     /* to get some BeOS-isms */
44
#endif
45
46
#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))
47
#define OPENSTEP
48
#endif
49
33
50
#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
34
#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
51
#define __WIN32__
35
#define __WIN32__
52
#endif
36
#endif
53
37
54
#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))
38
#if defined(__WIN32__) && !defined(__CYGWIN__)
55
#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
39
#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
56
#    define GLAPI __declspec(dllexport)
40
#    define GLAPI __declspec(dllexport)
57
#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
41
#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
58
#    define GLAPI __declspec(dllimport)
42
#    define GLAPI __declspec(dllimport)
59
#  else /* for use with static link lib build of Win32 edition only */
43
#  else /* for use with static link lib build of Win32 edition only */
60
#    define GLAPI extern
44
#    define GLAPI extern
61
#  endif /* _STATIC_MESA support */
45
#  endif
62
#  if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
46
#  if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
63
#    define GLAPIENTRY 
47
#    define GLAPIENTRY
64
#  else
48
#  else
65
#    define GLAPIENTRY __stdcall
49
#    define GLAPIENTRY __stdcall
66
#  endif
50
#  endif
Lines 72-81 Link Here
72
#  define GLAPIENTRY
56
#  define GLAPIENTRY
73
#endif /* WIN32 && !CYGWIN */
57
#endif /* WIN32 && !CYGWIN */
74
58
75
#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)
76
#  define PRAGMA_EXPORT_SUPPORTED		1
77
#endif
78
79
/*
59
/*
80
 * WINDOWS: Include windows.h here to define APIENTRY.
60
 * WINDOWS: Include windows.h here to define APIENTRY.
81
 * It is also useful when applications include this file by
61
 * It is also useful when applications include this file by
Lines 91-100 Link Here
91
#include <windows.h>
71
#include <windows.h>
92
#endif
72
#endif
93
73
94
#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
95
#pragma import on
96
#endif
97
98
#ifndef GLAPI
74
#ifndef GLAPI
99
#define GLAPI extern
75
#define GLAPI extern
100
#endif
76
#endif
Lines 116-130 Link Here
116
#define GLAPIENTRYP GLAPIENTRY *
92
#define GLAPIENTRYP GLAPIENTRY *
117
#endif
93
#endif
118
94
119
#ifdef CENTERLINE_CLPP
120
#define signed
121
#endif
122
123
#if defined(PRAGMA_EXPORT_SUPPORTED)
124
#pragma export on
125
#endif
126
127
#endif /* !__SCITECH_SNAP__ */
128
/*
95
/*
129
 * End system-specific stuff.
96
 * End system-specific stuff.
130
 **********************************************************************/
97
 **********************************************************************/
Lines 718-724 Link Here
718
#define GL_LIST_BIT				0x00020000
685
#define GL_LIST_BIT				0x00020000
719
#define GL_TEXTURE_BIT				0x00040000
686
#define GL_TEXTURE_BIT				0x00040000
720
#define GL_SCISSOR_BIT				0x00080000
687
#define GL_SCISSOR_BIT				0x00080000
721
#define GL_ALL_ATTRIB_BITS			0x000FFFFF
688
#define GL_ALL_ATTRIB_BITS			0xFFFFFFFF
722
689
723
690
724
/* OpenGL 1.1 */
691
/* OpenGL 1.1 */
Lines 1738-1743 Link Here
1738
1705
1739
1706
1740
1707
1708
1741
/*
1709
/*
1742
 * OpenGL 1.3
1710
 * OpenGL 1.3
1743
 */
1711
 */
Lines 2085-2110 Link Here
2085
2053
2086
2054
2087
2055
2088
#if GL_ARB_shader_objects
2089
2090
#ifndef GL_MESA_shader_debug
2091
#define GL_MESA_shader_debug 1
2092
2093
#define GL_DEBUG_OBJECT_MESA              0x8759
2094
#define GL_DEBUG_PRINT_MESA               0x875A
2095
#define GL_DEBUG_ASSERT_MESA              0x875B
2096
2097
GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);
2098
GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
2099
GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,
2100
                                         GLsizei *length, GLcharARB *debugLog);
2101
GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);
2102
2103
#endif /* GL_MESA_shader_debug */
2104
2105
#endif /* GL_ARB_shader_objects */
2106
2107
2108
/*
2056
/*
2109
 * ???. GL_MESA_packed_depth_stencil
2057
 * ???. GL_MESA_packed_depth_stencil
2110
 * XXX obsolete
2058
 * XXX obsolete
Lines 2121-2180 Link Here
2121
#endif /* GL_MESA_packed_depth_stencil */
2069
#endif /* GL_MESA_packed_depth_stencil */
2122
2070
2123
2071
2124
#ifndef GL_MESA_program_debug
2125
#define GL_MESA_program_debug 1
2126
2127
#define GL_FRAGMENT_PROGRAM_POSITION_MESA       0x8bb0
2128
#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA       0x8bb1
2129
#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA  0x8bb2
2130
#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA  0x8bb3
2131
#define GL_VERTEX_PROGRAM_POSITION_MESA         0x8bb4
2132
#define GL_VERTEX_PROGRAM_CALLBACK_MESA         0x8bb5
2133
#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA    0x8bb6
2134
#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA    0x8bb7
2135
2136
typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);
2137
2138
GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);
2139
2140
GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);
2141
2142
#endif /* GL_MESA_program_debug */
2143
2144
2145
#ifndef GL_MESA_texture_array
2146
#define GL_MESA_texture_array 1
2147
2148
/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array.
2149
 */
2150
#ifndef GL_EXT_texture_array
2151
2152
#ifdef GL_GLEXT_PROTOTYPES
2153
GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target,
2154
    GLenum attachment, GLuint texture, GLint level, GLint layer);
2155
#endif /* GL_GLEXT_PROTOTYPES */
2156
2157
#if 0
2158
/* (temporarily) disabled because of collision with typedef in glext.h
2159
 * that happens if apps include both gl.h and glext.h
2160
 */
2161
typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target,
2162
    GLenum attachment, GLuint texture, GLint level, GLint layer);
2163
#endif
2164
2165
#define GL_TEXTURE_1D_ARRAY_EXT         0x8C18
2166
#define GL_PROXY_TEXTURE_1D_ARRAY_EXT   0x8C19
2167
#define GL_TEXTURE_2D_ARRAY_EXT         0x8C1A
2168
#define GL_PROXY_TEXTURE_2D_ARRAY_EXT   0x8C1B
2169
#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C
2170
#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D
2171
#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF
2172
#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
2173
#endif
2174
2175
#endif
2176
2177
2178
#ifndef GL_ATI_blend_equation_separate
2072
#ifndef GL_ATI_blend_equation_separate
2179
#define GL_ATI_blend_equation_separate 1
2073
#define GL_ATI_blend_equation_separate 1
2180
2074
Lines 2186-2212 Link Here
2186
#endif /* GL_ATI_blend_equation_separate */
2080
#endif /* GL_ATI_blend_equation_separate */
2187
2081
2188
2082
2189
/**
2083
/* GL_OES_EGL_image */
2190
 ** NOTE!!!!!  If you add new functions to this file, or update
2084
#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage)
2191
 ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
2085
typedef void* GLeglImageOES;
2192
 ** in that file for details.
2193
 **/
2194
2195
2196
2197
/**********************************************************************
2198
 * Begin system-specific stuff
2199
 */
2200
#if defined(PRAGMA_EXPORT_SUPPORTED)
2201
#pragma export off
2202
#endif
2086
#endif
2203
2087
2204
#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED
2088
#ifndef GL_OES_EGL_image
2205
#pragma import off
2089
#define GL_OES_EGL_image 1
2090
#ifdef GL_GLEXT_PROTOTYPES
2091
GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
2092
GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
2093
#endif
2094
typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
2095
typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
2206
#endif
2096
#endif
2207
/*
2208
 * End system-specific stuff
2209
 **********************************************************************/
2210
2097
2211
2098
2212
#ifdef __cplusplus
2099
#ifdef __cplusplus

Return to bug 692206