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>

src/asahi/compiler/agx_compile.c

@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "compiler/nir_types.h"
 #include "compiler/nir/nir_builder.h"
 #include "util/u_debug.h"

src/compiler/glsl/gl_nir_link_varyings.h

@@ -31,7 +31,7 @@
  */
 
 
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "program/prog_parameter.h"
 #include "util/bitset.h"
 

src/compiler/glsl/gl_nir_linker.h

@@ -27,7 +27,7 @@
 #include <stdbool.h>
 
 #include "nir.h"
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "main/menums.h"
 
 #ifdef __cplusplus

src/gallium/drivers/r300/compiler/radeon_pair_regalloc.c

@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "util/register_allocate.h"
 #include "util/u_memory.h"
 #include "util/ralloc.h"

src/glx/apple/apple_glapi.c

@@ -38,7 +38,7 @@
 
 #include <GL/gl.h>
 
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "glapi.h"
 #include "glapitable.h"
 

src/glx/apple/apple_xgl_api_read.c

@@ -37,7 +37,7 @@
 #include "glxclient.h"
 #include "apple_glx_context.h"
 #include "apple_xgl_api.h"
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "glapitable.h"
 
 extern struct _glapi_table * __ogl_framework_api;

src/glx/apple/apple_xgl_api_stereo.c

@@ -40,7 +40,7 @@
 #include "glxclient.h"
 #include "apple_glx_context.h"
 #include "apple_xgl_api.h"
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "glapitable.h"
 
 extern struct _glapi_table * __ogl_framework_api;

src/glx/apple/apple_xgl_api_viewport.c

@@ -30,7 +30,7 @@
 #include "glxclient.h"
 #include "apple_glx_context.h"
 #include "apple_xgl_api.h"
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "glapitable.h"
 
 extern struct _glapi_table * __ogl_framework_api;

src/glx/tests/indirect_api.cpp

@@ -44,7 +44,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "main/glheader.h"
+#include "util/glheader.h"
 #include "../indirect_init.h"
 #include "glapi/glapi.h"
 #include "../../mesa/main/dispatch.h"

src/mapi/glapi/gen/gl_enums.py

@@ -49,7 +49,7 @@ class PrintGlEnums(gl_XML.gl_print_base):
 
     def printRealHeader(self):
         print('#include <stdio.h>')
-        print('#include "main/glheader.h"')
+        print('#include "util/glheader.h"')
         print('#include "main/enums.h"')
         print('#include "main/mtypes.h"')
         print('')

src/mapi/glapi/gen/gl_gentable.py

@@ -49,7 +49,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i
 #include <stdio.h>
 #include <string.h>
 
-#include "main/glheader.h"
+#include "util/glheader.h"
 
 #include "glapi.h"
 #include "glapitable.h"

src/mapi/glapi/gen/gl_table.py

@@ -103,7 +103,7 @@ class PrintRemapTable(gl_XML.gl_print_base):
  * named function in the specified dispatch table.
  */
 
-#include "main/glheader.h"
+#include "util/glheader.h"
 """)
         return
 

src/mapi/glapi/tests/check_table.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "main/glheader.h"
+#include "util/glheader.h"
 
 #include "glapi/glapi.h"
 #include "glapitable.h"

src/mapi/shared-glapi/tests/check_table.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "../../../mesa/main/glheader.h"
+#include "util/glheader.h"
 
 #include "glapi/glapi.h"
 #include "glapitable.h"

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"

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;
 

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"

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"

src/mesa/main/arrayobj.c

@@ -40,7 +40,7 @@
  */
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 #include "hash.h"
 #include "image.h"
 

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"

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"
 

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;

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"

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;

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;
 

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"

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"

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,

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"

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"

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;

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"

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"

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;
 

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"

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"

src/mesa/main/condrender.h

@@ -27,7 +27,7 @@
 #define CONDRENDER_H
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 #include "context.h"
 
 extern GLboolean

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;
 

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"
 

src/mesa/main/context.c

@@ -76,7 +76,7 @@
  */
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 #include "accum.h"
 #include "arrayobj.h"

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"

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"

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;

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"
 
 

src/mesa/main/depth.c

@@ -23,7 +23,7 @@
  */
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 #include "context.h"
 #include "depth.h"

src/mesa/main/depth.h

@@ -32,7 +32,7 @@
 #define DEPTH_H
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 struct gl_context;
 

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"

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" {

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"

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"

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"

src/mesa/main/enable.h

@@ -32,7 +32,7 @@
 #define ENABLE_H
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 struct gl_context;
 

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"
 
 

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"

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"

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 *

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;

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"

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"

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"

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"

src/mesa/main/fog.h

@@ -37,7 +37,7 @@
 #define FOG_H
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 struct gl_context;
 

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,

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"

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,

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"

src/mesa/main/get.h

@@ -32,7 +32,7 @@
 #define GET_H
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 struct gl_vertex_array_object;
 

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"

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)

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" {

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" {

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"

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"

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"

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;
 

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"

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;

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"

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;

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"

src/mesa/main/lines.h

@@ -33,7 +33,7 @@
 #define LINES_H
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 struct gl_context;
 

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"
 
 

src/mesa/main/matrix.c

@@ -35,7 +35,7 @@
  */
 
 
-#include "glheader.h"
+#include "util/glheader.h"
 
 #include "context.h"
 #include "enums.h"

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;

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" {

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;

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"

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"

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;
 

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"
 

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;

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"

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;

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"

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);

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"

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);

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"

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" {

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"