diff options
| author | Yonggang Luo <luoyonggang@gmail.com> | 2022-11-02 22:43:19 +0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-11-03 16:07:31 +0000 |
| commit | bfa3ce44a66610f8dd3bdcd014c32c14441a7d74 (patch) | |
| tree | 08d092aa8c4538b62d330a55ac5cacfff8ebdfdb /src/mesa/main | |
| parent | 7b7bbe871c067d1dfdb4fe4adfc0f38d051fe04c (diff) | |
mesa: Move glheader.h from mesa/main/glheader.h to util/glheader.h
So it's can be accessed in broader places
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Brian Paul brianp@vmware.com
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19472>
Diffstat (limited to 'src/mesa/main')
151 files changed, 150 insertions, 334 deletions
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index a4fa9ed15ac..0a449d6ab6e 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -22,7 +22,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "glheader.h" +#include "util/glheader.h" #include "accum.h" #include "condrender.h" #include "context.h" diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h index b5c83ef707f..0a8bcfc2c5d 100644 --- a/src/mesa/main/accum.h +++ b/src/mesa/main/accum.h @@ -37,7 +37,7 @@ #ifndef ACCUM_H #define ACCUM_H -#include "main/glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 2f0c388fefd..bdc741c8d89 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -34,7 +34,7 @@ * Keith Whitwell <keithw@vmware.com> */ -#include "glheader.h" +#include "util/glheader.h" #include "arrayobj.h" #include "api_arrayelt.h" #include "bufferobj.h" diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c index 28102ebe09c..fbfd4a0385f 100644 --- a/src/mesa/main/arbprogram.c +++ b/src/mesa/main/arbprogram.c @@ -29,7 +29,7 @@ */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/draw_validate.h" #include "main/hash.h" diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index d28ead61fc0..300184d9ef0 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -40,7 +40,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "hash.h" #include "image.h" diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 9763526b727..5e17dbeed96 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -27,7 +27,7 @@ #ifndef ARRAYOBJ_H #define ARRAYOBJ_H -#include "glheader.h" +#include "util/glheader.h" #include "mtypes.h" #include "glformats.h" #include "vbo/vbo.h" diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c index c3b370bab9f..f8fd16a3504 100644 --- a/src/mesa/main/atifragshader.c +++ b/src/mesa/main/atifragshader.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/hash.h" diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h index 5eff6a727e9..edf3f5d164e 100644 --- a/src/mesa/main/atifragshader.h +++ b/src/mesa/main/atifragshader.h @@ -8,7 +8,7 @@ #ifndef ATIFRAGSHADER_H #define ATIFRAGSHADER_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index d0606fb3b95..9ecc6ac78eb 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -23,7 +23,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "glheader.h" +#include "util/glheader.h" #include "accum.h" #include "arrayobj.h" diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h index 61b5975dabe..577e2a0e80f 100644 --- a/src/mesa/main/attrib.h +++ b/src/mesa/main/attrib.h @@ -26,7 +26,7 @@ #define ATTRIB_H -#include "glheader.h" +#include "util/glheader.h" struct _glapi_table; struct gl_context; diff --git a/src/mesa/main/bbox.h b/src/mesa/main/bbox.h index 84b931377c5..97e356a3306 100644 --- a/src/mesa/main/bbox.h +++ b/src/mesa/main/bbox.h @@ -27,7 +27,7 @@ #ifndef BBOX_H #define BBOX_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 0615071708c..a950e3644e7 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -29,7 +29,7 @@ -#include "glheader.h" +#include "util/glheader.h" #include "blend.h" #include "context.h" #include "draw_validate.h" diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h index 062fe516188..93d37575629 100644 --- a/src/mesa/main/blend.h +++ b/src/mesa/main/blend.h @@ -33,7 +33,7 @@ #define BLEND_H -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "formats.h" #include "extensions.h" diff --git a/src/mesa/main/blit.h b/src/mesa/main/blit.h index 55ff24a6342..24f46c58a57 100644 --- a/src/mesa/main/blit.h +++ b/src/mesa/main/blit.h @@ -26,7 +26,7 @@ #ifndef BLIT_H #define BLIT_H -#include "glheader.h" +#include "util/glheader.h" extern bool _mesa_regions_overlap(int srcX0, int srcY0, diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 5ff1ad21bd1..bb41c51420f 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -33,7 +33,7 @@ #include <stdbool.h> #include <inttypes.h> /* for PRId64 macro */ #include "util/u_debug.h" -#include "glheader.h" +#include "util/glheader.h" #include "enums.h" #include "hash.h" #include "context.h" diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index 24dfbb6e3aa..79cd6834a0a 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -30,7 +30,7 @@ -#include "glheader.h" +#include "util/glheader.h" #include "buffers.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h index 1e65f9cab5d..004ba17689c 100644 --- a/src/mesa/main/buffers.h +++ b/src/mesa/main/buffers.h @@ -33,7 +33,7 @@ #define BUFFERS_H -#include "glheader.h" +#include "util/glheader.h" #include "menums.h" struct gl_context; diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c index 611b40686f4..0837b253660 100644 --- a/src/mesa/main/clear.c +++ b/src/mesa/main/clear.c @@ -31,7 +31,7 @@ #include "glformats.h" -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" #include "fbobject.h" diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c index c7b152d4f74..b69ae5a956b 100644 --- a/src/mesa/main/clip.c +++ b/src/mesa/main/clip.c @@ -23,7 +23,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "clip.h" #include "context.h" #include "macros.h" diff --git a/src/mesa/main/clip.h b/src/mesa/main/clip.h index 1dce604e61d..dc0db979499 100644 --- a/src/mesa/main/clip.h +++ b/src/mesa/main/clip.h @@ -31,7 +31,7 @@ #ifndef CLIP_H #define CLIP_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/compute.c b/src/mesa/main/compute.c index 331d67cc790..8e585fdf39a 100644 --- a/src/mesa/main/compute.c +++ b/src/mesa/main/compute.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "context.h" #include "state.h" diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c index 9489aac3cee..97fc4cc6207 100644 --- a/src/mesa/main/condrender.c +++ b/src/mesa/main/condrender.c @@ -30,7 +30,7 @@ * \author Brian Paul */ -#include "glheader.h" +#include "util/glheader.h" #include "condrender.h" #include "enums.h" #include "mtypes.h" diff --git a/src/mesa/main/condrender.h b/src/mesa/main/condrender.h index 0a8d0beb326..03984b6b59d 100644 --- a/src/mesa/main/condrender.h +++ b/src/mesa/main/condrender.h @@ -27,7 +27,7 @@ #define CONDRENDER_H -#include "glheader.h" +#include "util/glheader.h" #include "context.h" extern GLboolean diff --git a/src/mesa/main/conservativeraster.h b/src/mesa/main/conservativeraster.h index a7278963a17..c8899d564c4 100644 --- a/src/mesa/main/conservativeraster.h +++ b/src/mesa/main/conservativeraster.h @@ -26,7 +26,7 @@ #ifndef CONSERVATIVERASTER_H #define CONSERVATIVERASTER_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/consts_exts.h b/src/mesa/main/consts_exts.h index 72bedc434e7..ea008792d44 100644 --- a/src/mesa/main/consts_exts.h +++ b/src/mesa/main/consts_exts.h @@ -31,7 +31,7 @@ #ifndef __CONSTS_EXTS_H__ #define __CONSTS_EXTS_H__ -#include "main/glheader.h" +#include "util/glheader.h" #include "compiler/shader_enums.h" #include "compiler/shader_info.h" diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 33fcf8877bf..6ab069fbd52 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -76,7 +76,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "accum.h" #include "arrayobj.h" diff --git a/src/mesa/main/copyimage.c b/src/mesa/main/copyimage.c index bde57535b07..91746dddec9 100644 --- a/src/mesa/main/copyimage.c +++ b/src/mesa/main/copyimage.c @@ -26,7 +26,7 @@ */ #include "context.h" -#include "glheader.h" +#include "util/glheader.h" #include "errors.h" #include "enums.h" #include "teximage.h" diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 8806e1a4e50..59626bde596 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -31,7 +31,7 @@ #ifndef DD_INCLUDED #define DD_INCLUDED -#include "glheader.h" +#include "util/glheader.h" #include "formats.h" #include "menums.h" #include "compiler/shader_enums.h" diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h index 902f59538bd..64aaf176086 100644 --- a/src/mesa/main/debug.h +++ b/src/mesa/main/debug.h @@ -36,7 +36,7 @@ #ifndef _DEBUG_H #define _DEBUG_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_texture_image; diff --git a/src/mesa/main/debug_output.h b/src/mesa/main/debug_output.h index 63dc3157ac0..3ac009ab5a1 100644 --- a/src/mesa/main/debug_output.h +++ b/src/mesa/main/debug_output.h @@ -29,7 +29,7 @@ #include <stdio.h> #include <stdarg.h> -#include "glheader.h" +#include "util/glheader.h" #include "menums.h" diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c index 31ffcd46bc8..a0041cff573 100644 --- a/src/mesa/main/depth.c +++ b/src/mesa/main/depth.c @@ -23,7 +23,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "depth.h" diff --git a/src/mesa/main/depth.h b/src/mesa/main/depth.h index 67e406e9390..512474a5179 100644 --- a/src/mesa/main/depth.h +++ b/src/mesa/main/depth.h @@ -32,7 +32,7 @@ #define DEPTH_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c index 87d88a81cb8..33da01ac532 100644 --- a/src/mesa/main/draw.c +++ b/src/mesa/main/draw.c @@ -28,7 +28,7 @@ #include <stdio.h> #include "arrayobj.h" -#include "glheader.h" +#include "util/glheader.h" #include "c99_alloca.h" #include "context.h" #include "state.h" diff --git a/src/mesa/main/draw.h b/src/mesa/main/draw.h index 1d5a841f3fe..ad603ca9eef 100644 --- a/src/mesa/main/draw.h +++ b/src/mesa/main/draw.h @@ -32,7 +32,7 @@ #define DRAW_H #include <stdbool.h> -#include "main/glheader.h" +#include "util/glheader.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/draw_validate.c b/src/mesa/main/draw_validate.c index 2ed59d90d5b..7f41070cbf9 100644 --- a/src/mesa/main/draw_validate.c +++ b/src/mesa/main/draw_validate.c @@ -23,7 +23,7 @@ */ #include <stdbool.h> -#include "glheader.h" +#include "util/glheader.h" #include "draw_validate.h" #include "arrayobj.h" #include "bufferobj.h" diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c index 627330dd2c8..e9362829f70 100644 --- a/src/mesa/main/drawpix.c +++ b/src/mesa/main/drawpix.c @@ -22,7 +22,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "glheader.h" +#include "util/glheader.h" #include "draw_validate.h" #include "bufferobj.h" #include "context.h" diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index e1c74225fb3..5aab14268bf 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -28,7 +28,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "arrayobj.h" #include "blend.h" #include "clip.h" diff --git a/src/mesa/main/enable.h b/src/mesa/main/enable.h index 29a7731ec40..7a064acdde5 100644 --- a/src/mesa/main/enable.h +++ b/src/mesa/main/enable.h @@ -32,7 +32,7 @@ #define ENABLE_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/errors.h b/src/mesa/main/errors.h index 705b482e9dd..3effdf39af4 100644 --- a/src/mesa/main/errors.h +++ b/src/mesa/main/errors.h @@ -38,7 +38,7 @@ #include <stdio.h> #include <stdarg.h> -#include "glheader.h" +#include "util/glheader.h" #include "menums.h" diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index dd8af521b9e..320e35bd6e9 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -37,7 +37,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "eval.h" #include "macros.h" diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index ed35eeebfed..84fdcf89394 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -31,7 +31,7 @@ #include "util/os_misc.h" -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "extensions.h" diff --git a/src/mesa/main/externalobjects.h b/src/mesa/main/externalobjects.h index 1bb04814a8a..853451499c3 100644 --- a/src/mesa/main/externalobjects.h +++ b/src/mesa/main/externalobjects.h @@ -34,7 +34,7 @@ #ifndef EXTERNALOBJECTS_H #define EXTERNALOBJECTS_H -#include "glheader.h" +#include "util/glheader.h" #include "hash.h" static inline struct gl_memory_object * diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h index 966ceca8913..bcc4e08eb69 100644 --- a/src/mesa/main/fbobject.h +++ b/src/mesa/main/fbobject.h @@ -26,7 +26,7 @@ #ifndef FBOBJECT_H #define FBOBJECT_H -#include "glheader.h" +#include "util/glheader.h" #include <stdbool.h> struct gl_context; diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index 262bf98dfb5..1f4c941bb99 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -29,7 +29,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "c99_alloca.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index add6a09d7c4..5904ec5e4a0 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -27,7 +27,7 @@ * **************************************************************************/ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/macros.h" diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index c28bd732f97..a0346c84210 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -34,7 +34,7 @@ #include "main/errors.h" -#include "main/glheader.h" +#include "util/glheader.h" #include "main/mtypes.h" #include "main/macros.h" #include "main/enums.h" diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c index 33e0ddeff7c..5eb136fc880 100644 --- a/src/mesa/main/fog.c +++ b/src/mesa/main/fog.c @@ -23,7 +23,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "fog.h" #include "macros.h" diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h index 057f618c7e5..838175cee0f 100644 --- a/src/mesa/main/fog.h +++ b/src/mesa/main/fog.h @@ -37,7 +37,7 @@ #define FOG_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/formatquery.h b/src/mesa/main/formatquery.h index e5ed638e87c..55c79b88bdc 100644 --- a/src/mesa/main/formatquery.h +++ b/src/mesa/main/formatquery.h @@ -24,7 +24,7 @@ #ifndef FORMATQUERY_H #define FORMATQUERY_H -#include "glheader.h" +#include "util/glheader.h" size_t _mesa_query_samples_for_format(struct gl_context *ctx, GLenum target, diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c index 18f00820bb9..9df30129aed 100644 --- a/src/mesa/main/framebuffer.c +++ b/src/mesa/main/framebuffer.c @@ -30,7 +30,7 @@ */ #include <stdio.h> -#include "glheader.h" +#include "util/glheader.h" #include "blend.h" #include "buffers.h" diff --git a/src/mesa/main/genmipmap.h b/src/mesa/main/genmipmap.h index 05e9318a891..09ae054ea48 100644 --- a/src/mesa/main/genmipmap.h +++ b/src/mesa/main/genmipmap.h @@ -26,7 +26,7 @@ #ifndef GENMIPMAP_H #define GENMIPMAP_H -#include "glheader.h" +#include "util/glheader.h" bool _mesa_is_valid_generate_texture_mipmap_target(struct gl_context *ctx, diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index bcd18d0549f..ae61a189a98 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -23,7 +23,7 @@ * Author: Kristian Høgsberg <krh@bitplanet.net> */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "blend.h" #include "debug_output.h" diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h index 6866c2c0ff5..c7399b9bc84 100644 --- a/src/mesa/main/get.h +++ b/src/mesa/main/get.h @@ -32,7 +32,7 @@ #define GET_H -#include "glheader.h" +#include "util/glheader.h" struct gl_vertex_array_object; diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 0c1ae3dd702..3fb7832e9b0 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -24,7 +24,7 @@ #include <stdbool.h> -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "debug_output.h" #include "get.h" diff --git a/src/mesa/main/glconfig.h b/src/mesa/main/glconfig.h index 80414d5d78e..12255c0e799 100644 --- a/src/mesa/main/glconfig.h +++ b/src/mesa/main/glconfig.h @@ -1,7 +1,7 @@ #ifndef __GL_CONFIG_H__ #define __GL_CONFIG_H__ -#include "main/glheader.h" +#include "util/glheader.h" /** * Framebuffer configuration (aka visual / pixelformat) diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h deleted file mode 100644 index bf24f6f30d0..00000000000 --- a/src/mesa/main/glheader.h +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Mesa 3-D graphics library - * - * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - - -/** - * \file glheader.h - * Wrapper for GL/gl.h and GL/glext.h - */ - - -#ifndef GLHEADER_H -#define GLHEADER_H - - -#define GL_GLEXT_PROTOTYPES -#if defined(_WIN32) && !defined(__CYGWIN__) -/* Prevent glheader.h from including <windows.h> by defining APIENTRY */ -#pragma push_macro("APIENTRY") -#ifndef APIENTRY -#define APIENTRY GLAPIENTRY -#endif -#include "GL/gl.h" -#include "GL/glext.h" -#pragma pop_macro("APIENTRY") -#else /* !(defined(_WIN32) && !defined(__CYGWIN__)) */ -#include "GL/gl.h" -#include "GL/glext.h" -#endif /* defined(_WIN32) && !defined(__CYGWIN__) */ - - -#ifdef __cplusplus -extern "C" { -#endif - - -/* Custom Mesa types to save space. */ -typedef unsigned char GLenum8; /* only for primitive modes */ -typedef unsigned short GLenum16; -typedef unsigned char GLbitfield8; -typedef unsigned short GLbitfield16; -typedef GLuint64 GLbitfield64; - -/* Common GLES 1.0 and 2.0 tokens */ - -#ifndef GL_OES_EGL_image_external -#define GL_TEXTURE_EXTERNAL_OES 0x8D65 -#define GL_SAMPLER_EXTERNAL_OES 0x8D66 -#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 -#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 -#endif - -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_ETC1_RGB8_OES 0x8D64 -#endif - - -/* GLES 1.0 only tokens */ - -typedef int GLclampx; - -#ifndef GL_OES_point_size_array -#define GL_POINT_SIZE_ARRAY_OES 0x8B9C -#define GL_POINT_SIZE_ARRAY_TYPE_OES 0x898A -#define GL_POINT_SIZE_ARRAY_STRIDE_OES 0x898B -#define GL_POINT_SIZE_ARRAY_POINTER_OES 0x898C -#define GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES 0x8B9F -#endif - - -#ifndef GL_OES_draw_texture -#define GL_TEXTURE_CROP_RECT_OES 0x8B9D -#endif - -#ifndef GL_TEXTURE_GEN_STR_OES -#define GL_TEXTURE_GEN_STR_OES 0x8D60 -#endif - - -/* GLES 2.0 only tokens */ - -#ifndef GL_PROGRAM_BINARY_LENGTH_OES -#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 -#endif - -#ifndef GL_OES_texture_compression_astc -#define GL_COMPRESSED_RGBA_ASTC_3x3x3_OES 0x93C0 -#define GL_COMPRESSED_RGBA_ASTC_4x3x3_OES 0x93C1 -#define GL_COMPRESSED_RGBA_ASTC_4x4x3_OES 0x93C2 -#define GL_COMPRESSED_RGBA_ASTC_4x4x4_OES 0x93C3 -#define GL_COMPRESSED_RGBA_ASTC_5x4x4_OES 0x93C4 -#define GL_COMPRESSED_RGBA_ASTC_5x5x4_OES 0x93C5 -#define GL_COMPRESSED_RGBA_ASTC_5x5x5_OES 0x93C6 -#define GL_COMPRESSED_RGBA_ASTC_6x5x5_OES 0x93C7 -#define GL_COMPRESSED_RGBA_ASTC_6x6x5_OES 0x93C8 -#define GL_COMPRESSED_RGBA_ASTC_6x6x6_OES 0x93C9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_3x3x3_OES 0x93E0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x3x3_OES 0x93E1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x3_OES 0x93E2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4x4_OES 0x93E3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4x4_OES 0x93E4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x4_OES 0x93E5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5x5_OES 0x93E6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5x5_OES 0x93E7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x5_OES 0x93E8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6x6_OES 0x93E9 -#endif - -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 -#endif - -#ifndef GL_EXT_disjoint_timer_query -#define GL_GPU_DISJOINT_EXT 0x8FBB -#endif - -/* Inexplicably, GL_HALF_FLOAT_OES has a different value than GL_HALF_FLOAT. - */ -#ifndef GL_HALF_FLOAT_OES -#define GL_HALF_FLOAT_OES 0x8D61 -#endif - -/* There is no formal spec for the following extension. */ -#ifndef GL_ATI_texture_compression_3dc -#define GL_ATI_texture_compression_3dc 1 -#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 -#endif - -#ifndef GL_EXT_texture_sRGB_R8 -#define GL_SR8_EXT 0x8FBD -#endif - -#ifndef GL_EXT_texture_sRGB_RG8 -#define GL_SRG8_EXT 0x8FBE -#endif - -#ifndef GL_AMD_compressed_ATC_texture -#define GL_ATC_RGB_AMD 0x8C92 -#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93 -#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE -#endif - -/** - * Internal token to represent a GLSL shader program (a collection of - * one or more shaders that get linked together). Note that GLSL - * shaders and shader programs share one name space (one hash table) - * so we need a value that's different from any of the - * GL_VERTEX/FRAGMENT/GEOMETRY_PROGRAM tokens. - */ -#define GL_SHADER_PROGRAM_MESA 0x9999 - -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -#endif - -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* GLHEADER_H */ diff --git a/src/mesa/main/glspirv.h b/src/mesa/main/glspirv.h index e9ef562584d..58248dc7661 100644 --- a/src/mesa/main/glspirv.h +++ b/src/mesa/main/glspirv.h @@ -25,7 +25,7 @@ #define GLSPIRV_H #include "compiler/nir/nir.h" -#include "main/glheader.h" +#include "util/glheader.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h index 001be6a7544..283e4a50b21 100644 --- a/src/mesa/main/glthread.h +++ b/src/mesa/main/glthread.h @@ -52,7 +52,7 @@ #include "GL/gl.h" #include "compiler/shader_enums.h" #include "main/config.h" -#include "glheader.h" +#include "util/glheader.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c index 14fb3e0df34..6a27901e15c 100644 --- a/src/mesa/main/hash.c +++ b/src/mesa/main/hash.c @@ -35,7 +35,7 @@ */ #include "errors.h" -#include "glheader.h" +#include "util/glheader.h" #include "hash.h" #include "util/hash_table.h" #include "util/u_memory.h" diff --git a/src/mesa/main/hash.h b/src/mesa/main/hash.h index 18612bd5c47..181528367bd 100644 --- a/src/mesa/main/hash.h +++ b/src/mesa/main/hash.h @@ -34,7 +34,7 @@ #include <stdbool.h> #include <stdint.h> -#include "glheader.h" +#include "util/glheader.h" #include "c11/threads.h" #include "util/simple_mtx.h" diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c index e329fc5c596..8f7166a75e0 100644 --- a/src/mesa/main/hint.c +++ b/src/mesa/main/hint.c @@ -24,7 +24,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "enums.h" #include "context.h" #include "hint.h" diff --git a/src/mesa/main/hint.h b/src/mesa/main/hint.h index fff30cfc322..705c667b44d 100644 --- a/src/mesa/main/hint.h +++ b/src/mesa/main/hint.h @@ -36,7 +36,7 @@ #ifndef HINT_H #define HINT_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index 09025327cf3..3b922e72ec1 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -30,7 +30,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "colormac.h" #include "glformats.h" #include "image.h" diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h index 32cbaf5fe47..e64213ff23d 100644 --- a/src/mesa/main/image.h +++ b/src/mesa/main/image.h @@ -27,7 +27,7 @@ #define IMAGE_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_pixelstore_attrib; diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c index e556f51265d..bb8d0526631 100644 --- a/src/mesa/main/light.c +++ b/src/mesa/main/light.c @@ -24,7 +24,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" #include "light.h" diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h index 2f9e281bf8a..00eb27d3aa1 100644 --- a/src/mesa/main/light.h +++ b/src/mesa/main/light.h @@ -29,7 +29,7 @@ #include <stdbool.h> -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_light; diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c index 7629d242e9f..d4a67a78792 100644 --- a/src/mesa/main/lines.c +++ b/src/mesa/main/lines.c @@ -23,7 +23,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "lines.h" #include "macros.h" diff --git a/src/mesa/main/lines.h b/src/mesa/main/lines.h index f1608b06039..abe6528ffab 100644 --- a/src/mesa/main/lines.h +++ b/src/mesa/main/lines.h @@ -33,7 +33,7 @@ #define LINES_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 9071379f5a8..93a5f1357d6 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -35,7 +35,7 @@ #include "util/u_math.h" #include "util/rounding.h" #include "util/compiler.h" -#include "main/glheader.h" +#include "util/glheader.h" #include "mesa_private.h" diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index a96d4ed53b5..768fddc344e 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -35,7 +35,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h index ceaba8771e4..f0f4b2e5f84 100644 --- a/src/mesa/main/matrix.h +++ b/src/mesa/main/matrix.h @@ -28,7 +28,7 @@ #define MATRIX_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_matrix_stack; diff --git a/src/mesa/main/mesa_private.h b/src/mesa/main/mesa_private.h index 229a746a809..0e2dc863c60 100644 --- a/src/mesa/main/mesa_private.h +++ b/src/mesa/main/mesa_private.h @@ -31,7 +31,7 @@ #ifndef MESA_PRIVATE_H #define MESA_PRIVATE_H -#include "glheader.h" +#include "util/glheader.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h index b3dd22e6b7d..1dd29c46df3 100644 --- a/src/mesa/main/mipmap.h +++ b/src/mesa/main/mipmap.h @@ -26,7 +26,7 @@ #ifndef MIPMAP_H #define MIPMAP_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_texture_object; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 42bea711f00..6bd289476ab 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -38,7 +38,7 @@ #include <stdbool.h> #include "c11/threads.h" -#include "main/glheader.h" +#include "util/glheader.h" #include "main/glthread.h" #include "main/consts_exts.h" #include "main/shader_types.h" diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c index 91592d7c691..78516678fc9 100644 --- a/src/mesa/main/multisample.c +++ b/src/mesa/main/multisample.c @@ -23,7 +23,7 @@ */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/macros.h" #include "main/multisample.h" diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h index 1b78dae7559..5bb4ed68697 100644 --- a/src/mesa/main/multisample.h +++ b/src/mesa/main/multisample.h @@ -26,7 +26,7 @@ #ifndef MULTISAMPLE_H #define MULTISAMPLE_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c index 257f9dd93e8..b1cf949530f 100644 --- a/src/mesa/main/pack.c +++ b/src/mesa/main/pack.c @@ -43,7 +43,7 @@ #include "errors.h" -#include "glheader.h" +#include "util/glheader.h" #include "enums.h" #include "image.h" diff --git a/src/mesa/main/pack.h b/src/mesa/main/pack.h index 8625a145fca..16a62608979 100644 --- a/src/mesa/main/pack.h +++ b/src/mesa/main/pack.h @@ -28,7 +28,7 @@ #define PACK_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_pixelstore_attrib; diff --git a/src/mesa/main/pbo.c b/src/mesa/main/pbo.c index 80d6fcbb81a..e46333f340b 100644 --- a/src/mesa/main/pbo.c +++ b/src/mesa/main/pbo.c @@ -32,7 +32,7 @@ #include "errors.h" -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "glformats.h" #include "image.h" diff --git a/src/mesa/main/pbo.h b/src/mesa/main/pbo.h index bc764175ff4..e1911b19010 100644 --- a/src/mesa/main/pbo.h +++ b/src/mesa/main/pbo.h @@ -28,7 +28,7 @@ #define PBO_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_pixelstore_attrib; diff --git a/src/mesa/main/performance_monitor.c b/src/mesa/main/performance_monitor.c index 5228b1eec88..b992e1e985a 100644 --- a/src/mesa/main/performance_monitor.c +++ b/src/mesa/main/performance_monitor.c @@ -35,7 +35,7 @@ */ #include <stdbool.h> -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" #include "hash.h" diff --git a/src/mesa/main/performance_monitor.h b/src/mesa/main/performance_monitor.h index 30a34480179..b2754a48708 100644 --- a/src/mesa/main/performance_monitor.h +++ b/src/mesa/main/performance_monitor.h @@ -30,7 +30,7 @@ #ifndef PERFORMANCE_MONITOR_H #define PERFORMANCE_MONITOR_H -#include "glheader.h" +#include "util/glheader.h" extern void _mesa_init_performance_monitors(struct gl_context *ctx); diff --git a/src/mesa/main/performance_query.c b/src/mesa/main/performance_query.c index 95dac06b404..da129dbe9ff 100644 --- a/src/mesa/main/performance_query.c +++ b/src/mesa/main/performance_query.c @@ -27,7 +27,7 @@ */ #include <stdbool.h> -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" #include "hash.h" diff --git a/src/mesa/main/performance_query.h b/src/mesa/main/performance_query.h index 593ee9607a7..64ede844d4f 100644 --- a/src/mesa/main/performance_query.h +++ b/src/mesa/main/performance_query.h @@ -29,7 +29,7 @@ #ifndef PERFORMANCE_QUERY_H #define PERFORMANCE_QUERY_H -#include "glheader.h" +#include "util/glheader.h" extern void _mesa_init_performance_queries(struct gl_context *ctx); diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 8004869b501..a417ddb894a 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -32,7 +32,7 @@ */ #include <stdbool.h> -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/draw_validate.h" #include "main/enums.h" diff --git a/src/mesa/main/pipelineobj.h b/src/mesa/main/pipelineobj.h index f821fa63653..c40d6656e29 100644 --- a/src/mesa/main/pipelineobj.h +++ b/src/mesa/main/pipelineobj.h @@ -26,7 +26,7 @@ #ifndef PIPELINEOBJ_H #define PIPELINEOBJ_H -#include "glheader.h" +#include "util/glheader.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c index 155ef9ab4b7..ec75248ec1e 100644 --- a/src/mesa/main/pixel.c +++ b/src/mesa/main/pixel.c @@ -28,7 +28,7 @@ * Pixel transfer functions (glPixelZoom, glPixelMap, glPixelTransfer) */ -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "context.h" #include "macros.h" diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h index e6fb4ebf318..9ec720863af 100644 --- a/src/mesa/main/pixel.h +++ b/src/mesa/main/pixel.h @@ -33,7 +33,7 @@ #define PIXEL_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c index 0f384b5f86e..7af3dce9a01 100644 --- a/src/mesa/main/pixelstore.c +++ b/src/mesa/main/pixelstore.c @@ -28,7 +28,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "context.h" #include "pixelstore.h" diff --git a/src/mesa/main/pixelstore.h b/src/mesa/main/pixelstore.h index e8e633aade3..2bda9d691b7 100644 --- a/src/mesa/main/pixelstore.h +++ b/src/mesa/main/pixelstore.h @@ -32,7 +32,7 @@ #define PIXELSTORE_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/pixeltransfer.c b/src/mesa/main/pixeltransfer.c index 0bd39b1513d..9dbbb18ed3b 100644 --- a/src/mesa/main/pixeltransfer.c +++ b/src/mesa/main/pixeltransfer.c @@ -30,7 +30,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "macros.h" #include "pixeltransfer.h" diff --git a/src/mesa/main/pixeltransfer.h b/src/mesa/main/pixeltransfer.h index a12d0d8e2a3..85197f9153a 100644 --- a/src/mesa/main/pixeltransfer.h +++ b/src/mesa/main/pixeltransfer.h @@ -28,7 +28,7 @@ #define PIXELTRANSFER_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 367ee3a6317..57a10ec8aee 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -28,7 +28,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "macros.h" #include "points.h" diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h index 6c8b5f606b5..b2b244efe07 100644 --- a/src/mesa/main/points.h +++ b/src/mesa/main/points.h @@ -32,7 +32,7 @@ #define POINTS_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c index 1473880b1bc..1297aa4ad98 100644 --- a/src/mesa/main/polygon.c +++ b/src/mesa/main/polygon.c @@ -28,7 +28,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "draw_validate.h" diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h index 8e1f4282f5f..2d62fed7648 100644 --- a/src/mesa/main/polygon.h +++ b/src/mesa/main/polygon.h @@ -32,7 +32,7 @@ #define POLYGON_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c index bbbe158641b..8f2e78d5616 100644 --- a/src/mesa/main/querymatrix.c +++ b/src/mesa/main/querymatrix.c @@ -15,7 +15,7 @@ #include <stdlib.h> #include <math.h> -#include "glheader.h" +#include "util/glheader.h" #include "main/get.h" #include "util/macros.h" #include "api_exec_decl.h" diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 7f5560f7bdf..2ec09855843 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -24,7 +24,7 @@ #include "bufferobj.h" -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" #include "hash.h" diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c index 8769376ac39..c8301e38b6a 100644 --- a/src/mesa/main/rastpos.c +++ b/src/mesa/main/rastpos.c @@ -28,7 +28,7 @@ * Raster position operations. */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "feedback.h" #include "macros.h" diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h index 1a100916f6c..0a9291a77f3 100644 --- a/src/mesa/main/rastpos.h +++ b/src/mesa/main/rastpos.h @@ -32,7 +32,7 @@ #define RASTPOS_H -#include "glheader.h" +#include "util/glheader.h" struct _glapi_table; diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c index 05c2ad0c4ac..202357ce02c 100644 --- a/src/mesa/main/readpix.c +++ b/src/mesa/main/readpix.c @@ -22,7 +22,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "glheader.h" +#include "util/glheader.h" #include "blend.h" #include "bufferobj.h" diff --git a/src/mesa/main/readpix.h b/src/mesa/main/readpix.h index eb74a6d8a2c..581632fa60c 100644 --- a/src/mesa/main/readpix.h +++ b/src/mesa/main/readpix.h @@ -27,7 +27,7 @@ #define READPIXELS_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_pixelstore_attrib; diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c index fa03e014f04..e99cb7e28ba 100644 --- a/src/mesa/main/renderbuffer.c +++ b/src/mesa/main/renderbuffer.c @@ -23,7 +23,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "bufferobj.h" diff --git a/src/mesa/main/renderbuffer.h b/src/mesa/main/renderbuffer.h index 8ac97520057..288ddb929bf 100644 --- a/src/mesa/main/renderbuffer.h +++ b/src/mesa/main/renderbuffer.h @@ -26,7 +26,7 @@ #ifndef RENDERBUFFER_H #define RENDERBUFFER_H -#include "glheader.h" +#include "util/glheader.h" #include "menums.h" #ifdef __cplusplus diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index c1d379ddc8a..1cf53608d11 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -30,7 +30,7 @@ */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/enums.h" #include "main/hash.h" diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c index 90ac5e57676..c4bff669c6c 100644 --- a/src/mesa/main/scissor.c +++ b/src/mesa/main/scissor.c @@ -23,7 +23,7 @@ */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/enums.h" #include "main/mtypes.h" diff --git a/src/mesa/main/scissor.h b/src/mesa/main/scissor.h index df58da9ac40..e590747d700 100644 --- a/src/mesa/main/scissor.h +++ b/src/mesa/main/scissor.h @@ -27,7 +27,7 @@ #define SCISSOR_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h index ad3c7ae56f4..364af97282f 100644 --- a/src/mesa/main/shader_types.h +++ b/src/mesa/main/shader_types.h @@ -32,7 +32,7 @@ #define SHADER_TYPES_H #include "main/config.h" /* for MAX_FEEDBACK_BUFFERS */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/menums.h" #include "util/mesa-sha1.h" #include "compiler/shader_info.h" diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index a299efc2759..048106dccd5 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -36,7 +36,7 @@ #include <stdbool.h> #include <c99_alloca.h> -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "draw_validate.h" #include "main/enums.h" diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 90e90fee743..678757404a2 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -28,7 +28,7 @@ #define SHADERAPI_H -#include "glheader.h" +#include "util/glheader.h" #include "compiler/shader_enums.h" #include "util/mesa-sha1.h" diff --git a/src/mesa/main/shaderimage.h b/src/mesa/main/shaderimage.h index 032efea0827..2ebb5f2b047 100644 --- a/src/mesa/main/shaderimage.h +++ b/src/mesa/main/shaderimage.h @@ -27,7 +27,7 @@ #ifndef SHADERIMAGE_H #define SHADERIMAGE_H -#include "glheader.h" +#include "util/glheader.h" #include "formats.h" #ifdef __cplusplus diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 0d163290b00..5652f79cab4 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -31,7 +31,7 @@ #include "compiler/glsl/string_to_uint_map.h" -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/glspirv.h" #include "main/hash.h" diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h index c94e20ce370..c5f359dd632 100644 --- a/src/mesa/main/shaderobj.h +++ b/src/mesa/main/shaderobj.h @@ -27,7 +27,7 @@ #define SHADEROBJ_H -#include "main/glheader.h" +#include "util/glheader.h" #include "compiler/shader_enums.h" #include "program/link_program.h" #include "util/macros.h" diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index d6133a238c8..6cbc3dee364 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -31,7 +31,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "mtypes.h" #include "arrayobj.h" #include "context.h" diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c index e138e104128..64307faf7cb 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -47,7 +47,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "macros.h" diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h index db5c032af77..90027cce95e 100644 --- a/src/mesa/main/stencil.h +++ b/src/mesa/main/stencil.h @@ -32,7 +32,7 @@ #define STENCIL_H -#include "glheader.h" +#include "util/glheader.h" #include "macros.h" struct gl_context; diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c index 593d155f71c..49d6b9a9dcd 100644 --- a/src/mesa/main/syncobj.c +++ b/src/mesa/main/syncobj.c @@ -56,7 +56,7 @@ */ #include <inttypes.h> -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "macros.h" diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h index 8350b9f9038..9f69543f2ce 100644 --- a/src/mesa/main/syncobj.h +++ b/src/mesa/main/syncobj.h @@ -31,7 +31,7 @@ #ifndef SYNCOBJ_H #define SYNCOBJ_H -#include "glheader.h" +#include "util/glheader.h" struct _glapi_table; struct dd_function_table; diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index 59b37582b26..1ada9201aaf 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -30,7 +30,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "formats.h" diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h index b00924d02eb..25e02981c1c 100644 --- a/src/mesa/main/texcompress.h +++ b/src/mesa/main/texcompress.h @@ -26,7 +26,7 @@ #define TEXCOMPRESS_H #include "formats.h" -#include "glheader.h" +#include "util/glheader.h" struct gl_context; diff --git a/src/mesa/main/texcompress_bptc.h b/src/mesa/main/texcompress_bptc.h index f02b891d2f1..0de1bd31f2a 100644 --- a/src/mesa/main/texcompress_bptc.h +++ b/src/mesa/main/texcompress_bptc.h @@ -25,7 +25,7 @@ #define TEXCOMPRESS_BPTC_H #include <inttypes.h> -#include "glheader.h" +#include "util/glheader.h" #include "texcompress.h" #include "texstore.h" diff --git a/src/mesa/main/texcompress_cpal.c b/src/mesa/main/texcompress_cpal.c index 6b10e3db101..0db3bf6536e 100644 --- a/src/mesa/main/texcompress_cpal.c +++ b/src/mesa/main/texcompress_cpal.c @@ -31,7 +31,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "mtypes.h" diff --git a/src/mesa/main/texcompress_cpal.h b/src/mesa/main/texcompress_cpal.h index 1b8542f080e..dca0844a927 100644 --- a/src/mesa/main/texcompress_cpal.h +++ b/src/mesa/main/texcompress_cpal.h @@ -27,7 +27,7 @@ #define TEXCOMPRESS_CPAL_H -#include "main/glheader.h" +#include "util/glheader.h" extern void _mesa_cpal_compressed_teximage2d(GLenum target, GLint level, GLenum internalFormat, diff --git a/src/mesa/main/texcompress_etc.h b/src/mesa/main/texcompress_etc.h index 2c764b88b09..24075f5111f 100644 --- a/src/mesa/main/texcompress_etc.h +++ b/src/mesa/main/texcompress_etc.h @@ -25,7 +25,7 @@ #define TEXCOMPRESS_ETC1_H #include <inttypes.h> -#include "glheader.h" +#include "util/glheader.h" #include "texcompress.h" #include "texstore.h" diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index fd9e408bedf..2af091637a7 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/src/mesa/main/texcompress_fxt1.c @@ -30,7 +30,7 @@ #include "errors.h" -#include "glheader.h" +#include "util/glheader.h" #include "image.h" #include "macros.h" diff --git a/src/mesa/main/texcompress_fxt1.h b/src/mesa/main/texcompress_fxt1.h index 71094f27e43..35556c2c78f 100644 --- a/src/mesa/main/texcompress_fxt1.h +++ b/src/mesa/main/texcompress_fxt1.h @@ -25,7 +25,7 @@ #ifndef TEXCOMPRESS_FXT1_H #define TEXCOMPRESS_FXT1_H -#include "glheader.h" +#include "util/glheader.h" #include "texstore.h" diff --git a/src/mesa/main/texcompress_rgtc.c b/src/mesa/main/texcompress_rgtc.c index eddcf839bdd..a87493ec814 100644 --- a/src/mesa/main/texcompress_rgtc.c +++ b/src/mesa/main/texcompress_rgtc.c @@ -35,7 +35,7 @@ #include <stdlib.h> #include "config.h" -#include "glheader.h" +#include "util/glheader.h" #include "image.h" #include "macros.h" diff --git a/src/mesa/main/texcompress_rgtc.h b/src/mesa/main/texcompress_rgtc.h index ce08e00b291..e78a7dff5f6 100644 --- a/src/mesa/main/texcompress_rgtc.h +++ b/src/mesa/main/texcompress_rgtc.h @@ -24,7 +24,7 @@ #ifndef TEXCOMPRESS_RGTC_H #define TEXCOMPRESS_RGTC_H -#include "glheader.h" +#include "util/glheader.h" #include "texstore.h" diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index d489b2b783d..f862c7e9475 100644 --- a/src/mesa/main/texcompress_s3tc.c +++ b/src/mesa/main/texcompress_s3tc.c @@ -29,7 +29,7 @@ * GL_EXT_texture_compression_s3tc support. */ -#include "glheader.h" +#include "util/glheader.h" #include "image.h" #include "macros.h" diff --git a/src/mesa/main/texcompress_s3tc.h b/src/mesa/main/texcompress_s3tc.h index 833a397f392..f0728fdd590 100644 --- a/src/mesa/main/texcompress_s3tc.h +++ b/src/mesa/main/texcompress_s3tc.h @@ -25,7 +25,7 @@ #ifndef TEXCOMPRESS_S3TC_H #define TEXCOMPRESS_S3TC_H -#include "glheader.h" +#include "util/glheader.h" #include "texstore.h" #include "texcompress.h" diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c index 3026e80ae4f..b2a22ffb6f2 100644 --- a/src/mesa/main/texenv.c +++ b/src/mesa/main/texenv.c @@ -30,7 +30,7 @@ */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/blend.h" #include "main/enums.h" diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c index 2a2ba3b24b1..b757d7bbc25 100644 --- a/src/mesa/main/texgen.c +++ b/src/mesa/main/texgen.c @@ -30,7 +30,7 @@ */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/enums.h" #include "main/macros.h" diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c index d896c7ca6d8..66cd8cc1cb2 100644 --- a/src/mesa/main/texgetimage.c +++ b/src/mesa/main/texgetimage.c @@ -29,7 +29,7 @@ */ -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "enums.h" #include "context.h" diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h index 5e47650ec74..98e0de9bc30 100644 --- a/src/mesa/main/texgetimage.h +++ b/src/mesa/main/texgetimage.h @@ -27,7 +27,7 @@ #ifndef TEXGETIMAGE_H #define TEXGETIMAGE_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; struct gl_texture_image; diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 5a7b4f17497..37a42174098 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -30,7 +30,7 @@ */ #include <stdbool.h> -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h index 2182528ff52..fe66c46b99d 100644 --- a/src/mesa/main/texobj.h +++ b/src/mesa/main/texobj.h @@ -32,7 +32,7 @@ #define TEXTOBJ_H -#include "glheader.h" +#include "util/glheader.h" #include "samplerobj.h" diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index b8918f9500c..d85f3b3730e 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -30,7 +30,7 @@ */ #include <stdbool.h> -#include "main/glheader.h" +#include "util/glheader.h" #include "main/blend.h" #include "main/context.h" #include "main/enums.h" diff --git a/src/mesa/main/texparam.h b/src/mesa/main/texparam.h index b86a0cac740..113ed1d989b 100644 --- a/src/mesa/main/texparam.h +++ b/src/mesa/main/texparam.h @@ -27,7 +27,7 @@ #define TEXPARAM_H -#include "main/glheader.h" +#include "util/glheader.h" /** * \name Internal functions diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 87e81c901c8..49cfd5ddb96 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -29,7 +29,7 @@ */ #include <stdio.h> -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/texstorage.c b/src/mesa/main/texstorage.c index 4c82b05e1d3..b1f8de70c41 100644 --- a/src/mesa/main/texstorage.c +++ b/src/mesa/main/texstorage.c @@ -27,7 +27,7 @@ * GL_ARB_texture_storage functions */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index d5d0ac57bef..7c5b24b17da 100755 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -52,7 +52,7 @@ #include "errors.h" -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "format_pack.h" #include "format_utils.h" diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h index 9d735d16c70..796ff716522 100644 --- a/src/mesa/main/texstore.h +++ b/src/mesa/main/texstore.h @@ -36,7 +36,7 @@ #define TEXSTORE_H -#include "glheader.h" +#include "util/glheader.h" #include "formats.h" #include "util/macros.h" diff --git a/src/mesa/main/texturebindless.c b/src/mesa/main/texturebindless.c index 4c45413f780..16a29aab451 100644 --- a/src/mesa/main/texturebindless.c +++ b/src/mesa/main/texturebindless.c @@ -21,7 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/texturebindless.h b/src/mesa/main/texturebindless.h index cf8e5bd1b90..f045742755f 100644 --- a/src/mesa/main/texturebindless.h +++ b/src/mesa/main/texturebindless.h @@ -24,7 +24,7 @@ #ifndef TEXTUREBINDLESS_H #define TEXTUREBINDLESS_H -#include "glheader.h" +#include "util/glheader.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/main/textureview.c b/src/mesa/main/textureview.c index 65a132232bc..f8850e69944 100644 --- a/src/mesa/main/textureview.c +++ b/src/mesa/main/textureview.c @@ -31,7 +31,7 @@ * GL_ARB_texture_view functions */ -#include "glheader.h" +#include "util/glheader.h" #include "context.h" #include "enums.h" diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h index 25401b9529f..f299c80676c 100644 --- a/src/mesa/main/transformfeedback.h +++ b/src/mesa/main/transformfeedback.h @@ -29,7 +29,7 @@ #include <stdbool.h> #include "bufferobj.h" #include "util/compiler.h" -#include "glheader.h" +#include "util/glheader.h" #include "mtypes.h" struct _glapi_table; diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 6bb8727ee51..8ef622f2512 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -36,7 +36,7 @@ * 2. Insert FLUSH_VERTICES calls in various places */ -#include "main/glheader.h" +#include "util/glheader.h" #include "main/context.h" #include "main/shaderapi.h" #include "main/shaderobj.h" diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 827757f35df..7c96a0736d3 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -26,7 +26,7 @@ #ifndef UNIFORMS_H #define UNIFORMS_H -#include "main/glheader.h" +#include "util/glheader.h" #include "compiler/glsl_types.h" #include "compiler/glsl/ir_uniform.h" #include "program/prog_parameter.h" diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index a4eaa8d66f3..2fa12a9e9bd 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -27,7 +27,7 @@ #include <stdio.h> #include <inttypes.h> /* for PRId64 macro */ -#include "glheader.h" +#include "util/glheader.h" #include "bufferobj.h" #include "context.h" diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h index 535c6a864f3..cdfe7fc4946 100644 --- a/src/mesa/main/version.h +++ b/src/mesa/main/version.h @@ -28,7 +28,7 @@ #define VERSION_H #include <stdbool.h> -#include "glheader.h" +#include "util/glheader.h" #include "menums.h" struct gl_context; diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h index d33a5ae294a..dac493a0649 100644 --- a/src/mesa/main/viewport.h +++ b/src/mesa/main/viewport.h @@ -27,7 +27,7 @@ #ifndef VIEWPORT_H #define VIEWPORT_H -#include "glheader.h" +#include "util/glheader.h" struct gl_context; |