From b663eb83fe4974f958918a4a12da6af7b3585abe Mon Sep 17 00:00:00 2001
From: Timothy Arceri <tarceri@itsqueeze.com>
Date: Wed, 2 Oct 2024 15:30:04 +1000
Subject: [PATCH] glsl: move error and warning helpers to util file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These functions are already defined in linker_util.h so moving them here
is logical.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31500>
---
 src/compiler/glsl/linker.cpp      | 26 --------------------------
 src/compiler/glsl/linker_util.cpp | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index e49b52675ab..e6ae176f3e6 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -91,32 +91,6 @@
 #include "main/context.h"
 
 
-void
-linker_error(gl_shader_program *prog, const char *fmt, ...)
-{
-   va_list ap;
-
-   ralloc_strcat(&prog->data->InfoLog, "error: ");
-   va_start(ap, fmt);
-   ralloc_vasprintf_append(&prog->data->InfoLog, fmt, ap);
-   va_end(ap);
-
-   prog->data->LinkStatus = LINKING_FAILURE;
-}
-
-
-void
-linker_warning(gl_shader_program *prog, const char *fmt, ...)
-{
-   va_list ap;
-
-   ralloc_strcat(&prog->data->InfoLog, "warning: ");
-   va_start(ap, fmt);
-   ralloc_vasprintf_append(&prog->data->InfoLog, fmt, ap);
-   va_end(ap);
-
-}
-
 void
 link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
 {
diff --git a/src/compiler/glsl/linker_util.cpp b/src/compiler/glsl/linker_util.cpp
index 416d5bc2f1d..d24e87086ad 100644
--- a/src/compiler/glsl/linker_util.cpp
+++ b/src/compiler/glsl/linker_util.cpp
@@ -29,6 +29,31 @@
 #include "util/set.h"
 #include "main/consts_exts.h"
 
+void
+linker_error(gl_shader_program *prog, const char *fmt, ...)
+{
+   va_list ap;
+
+   ralloc_strcat(&prog->data->InfoLog, "error: ");
+   va_start(ap, fmt);
+   ralloc_vasprintf_append(&prog->data->InfoLog, fmt, ap);
+   va_end(ap);
+
+   prog->data->LinkStatus = LINKING_FAILURE;
+}
+
+void
+linker_warning(gl_shader_program *prog, const char *fmt, ...)
+{
+   va_list ap;
+
+   ralloc_strcat(&prog->data->InfoLog, "warning: ");
+   va_start(ap, fmt);
+   ralloc_vasprintf_append(&prog->data->InfoLog, fmt, ap);
+   va_end(ap);
+
+}
+
 /**
  * Given a string identifying a program resource, break it into a base name
  * and an optional array index in square brackets.