[Mesa-dev] [PATCH 5/6] mesa: remove duplicate declarations from glheader.h

[Timothy Arceri]

On 06/09/18 02:35, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Remove all the desktop GL and GLX entries from the list.
> Former are pulled by the gl.h and glext.h includes at the top while the
> latter are not longer needed.

not -> no

Series:

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

Are you considering finishing off SWAP_EXCHANGE support by any chance?

> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>   src/mesa/main/glheader.h | 54 ----------------------------------------
>   1 file changed, 54 deletions(-)
> 
> diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
> index 1a91d543126..b1f19e44008 100644
> --- a/src/mesa/main/glheader.h
> +++ b/src/mesa/main/glheader.h
> @@ -51,12 +51,6 @@ typedef GLuint64 GLbitfield64;
>   
>   typedef int GLclampx;
>   
> -
> -#ifndef GL_OES_EGL_image
> -typedef void *GLeglImageOES;
> -#endif
> -
> -
>   #ifndef GL_OES_EGL_image_external
>   #define GL_TEXTURE_EXTERNAL_OES                                 0x8D65
>   #define GL_SAMPLER_EXTERNAL_OES                                 0x8D66
> @@ -64,7 +58,6 @@ typedef void *GLeglImageOES;
>   #define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES                     0x8D68
>   #endif
>   
> -
>   #ifndef GL_OES_point_size_array
>   #define GL_POINT_SIZE_ARRAY_OES                                 0x8B9C
>   #define GL_POINT_SIZE_ARRAY_TYPE_OES                            0x898A
> @@ -84,27 +77,11 @@ typedef void *GLeglImageOES;
>   #endif
>   
>   /* GLES 2.0 tokens */
> -#ifndef GL_RGB565
> -#define GL_RGB565                                               0x8D62
> -#endif
>   
>   #ifndef GL_TEXTURE_GEN_STR_OES
>   #define GL_TEXTURE_GEN_STR_OES                                  0x8D60
>   #endif
>   
> -#ifndef GL_OES_compressed_paletted_texture
> -#define GL_PALETTE4_RGB8_OES                                    0x8B90
> -#define GL_PALETTE4_RGBA8_OES                                   0x8B91
> -#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
> -#define GL_PALETTE4_RGBA4_OES                                   0x8B93
> -#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
> -#define GL_PALETTE8_RGB8_OES                                    0x8B95
> -#define GL_PALETTE8_RGBA8_OES                                   0x8B96
> -#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
> -#define GL_PALETTE8_RGBA4_OES                                   0x8B98
> -#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
> -#endif
> -
>   #ifndef GL_OES_texture_compression_astc
>   #define GL_COMPRESSED_RGBA_ASTC_3x3x3_OES                       0x93C0
>   #define GL_COMPRESSED_RGBA_ASTC_4x3x3_OES                       0x93C1
> @@ -128,15 +105,6 @@ typedef void *GLeglImageOES;
>   #define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES               0x93E9
>   #endif
>   
> -#ifndef GL_ES_VERSION_2_0
> -#define GL_SHADER_BINARY_FORMATS                                0x8DF8
> -#define GL_NUM_SHADER_BINARY_FORMATS                            0x8DF9
> -#define GL_SHADER_COMPILER                                      0x8DFA
> -#define GL_MAX_VERTEX_UNIFORM_VECTORS                           0x8DFB
> -#define GL_MAX_VARYING_VECTORS                                  0x8DFC
> -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS                         0x8DFD
> -#endif
> -
>   #ifndef GL_ATI_texture_compression_3dc
>   #define GL_ATI_texture_compression_3dc                          1
>   #define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI                   0x8837
> @@ -174,28 +142,6 @@ typedef void *GLeglImageOES;
>   #define GL_SHADER_PROGRAM_MESA                                  0x9999
>   
>   
> -/* Several fields of struct gl_config can take these as values.  Since
> - * GLX header files may not be available everywhere they need to be used,
> - * redefine them here.
> - */
> -#define GLX_NONE                                                0x8000
> -#define GLX_SLOW_CONFIG                                         0x8001
> -#define GLX_TRUE_COLOR                                          0x8002
> -#define GLX_DIRECT_COLOR                                        0x8003
> -#define GLX_PSEUDO_COLOR                                        0x8004
> -#define GLX_STATIC_COLOR                                        0x8005
> -#define GLX_GRAY_SCALE                                          0x8006
> -#define GLX_STATIC_GRAY                                         0x8007
> -#define GLX_TRANSPARENT_RGB                                     0x8008
> -#define GLX_TRANSPARENT_INDEX                                   0x8009
> -#define GLX_NON_CONFORMANT_CONFIG                               0x800D
> -#define GLX_SWAP_EXCHANGE_OML                                   0x8061
> -#define GLX_SWAP_COPY_OML                                       0x8062
> -#define GLX_SWAP_UNDEFINED_OML                                  0x8063
> -
> -#define GLX_DONT_CARE                                           0xFFFFFFFF
> -
> -
>   #ifdef __cplusplus
>   }
>   #endif
>