From 8142797721c8f87fa84b43aec90904853038f461 Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Fri, 29 Nov 2024 12:51:18 +1100
Subject: [PATCH] glsl: move _mesa_glsl_compile_shader() declaration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The function is in glsl_parser_extras.cpp so move the declaration to
glsl_parser_extras.h

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32402>
---
 src/compiler/glsl/glsl_parser_extras.h          |  8 ++++++++
 src/compiler/glsl/glsl_to_nir.cpp               |  2 +-
 src/compiler/glsl/program.h                     | 17 -----------------
 .../glsl/tests/test_gl_lower_mediump.cpp        |  1 +
 src/mesa/main/shaderapi.c                       |  1 -
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h
index b355a7c510e..8edac02881e 100644
--- a/src/compiler/glsl/glsl_parser_extras.h
+++ b/src/compiler/glsl/glsl_parser_extras.h
@@ -1084,6 +1084,14 @@ extern "C" {
 struct glcpp_parser;
 struct _mesa_glsl_parse_state;
 
+struct gl_context;
+struct gl_shader;
+
+extern void
+_mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
+                          FILE *dump_ir_file, bool dump_ast, bool dump_hir,
+                          bool force_recompile);
+
 typedef void (*glcpp_extension_iterator)(
               struct _mesa_glsl_parse_state *state,
               void (*add_builtin_define)(struct glcpp_parser *, const char *, int),
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index e511a1d627e..eb366ed44cd 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -26,12 +26,12 @@
  */
 
 #include "float64_glsl.h"
+#include "glsl_parser_extras.h"
 #include "glsl_to_nir.h"
 #include "ir_visitor.h"
 #include "ir_hierarchical_visitor.h"
 #include "ir.h"
 #include "ir_optimization.h"
-#include "program.h"
 #include "compiler/nir/nir_control_flow.h"
 #include "compiler/nir/nir_builder.h"
 #include "compiler/nir/nir_builtin_builder.h"
diff --git a/src/compiler/glsl/program.h b/src/compiler/glsl/program.h
index 37c02eba37d..9cdbc60da9b 100644
--- a/src/compiler/glsl/program.h
+++ b/src/compiler/glsl/program.h
@@ -25,23 +25,6 @@
 #ifndef GLSL_PROGRAM_H
 #define GLSL_PROGRAM_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct gl_context;
-struct gl_shader;
-struct gl_shader_program;
-
-extern void
-_mesa_glsl_compile_shader(struct gl_context *ctx, struct gl_shader *shader,
-                          FILE *dump_ir_file, bool dump_ast, bool dump_hir,
-                          bool force_recompile);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
 extern void
 link_shaders(struct gl_context *ctx, struct gl_shader_program *prog);
 
diff --git a/src/compiler/glsl/tests/test_gl_lower_mediump.cpp b/src/compiler/glsl/tests/test_gl_lower_mediump.cpp
index bfcf14c6a76..dbef94b7a3a 100644
--- a/src/compiler/glsl/tests/test_gl_lower_mediump.cpp
+++ b/src/compiler/glsl/tests/test_gl_lower_mediump.cpp
@@ -33,6 +33,7 @@
 #include "nir.h"
 #include "gl_nir.h"
 #include "gl_nir_linker.h"
+#include "glsl_parser_extras.h"
 #include "glsl_to_nir.h"
 #include "linker_util.h"
 #include "nir_builder.h"
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 767f9aa022a..d79fdbd211b 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -53,7 +53,6 @@
 #include "compiler/glsl/builtin_functions.h"
 #include "compiler/glsl/glsl_parser_extras.h"
 #include "compiler/glsl/ir.h"
-#include "compiler/glsl/program.h"
 #include "program/program.h"
 #include "program/prog_print.h"
 #include "program/prog_parameter.h"