Mesa (main): mesa: rename ir_to_mesa.{cpp,h} -> link_program.{cpp,h}

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Dec 6 11:14:40 UTC 2021


Module: Mesa
Branch: main
Commit: bf1f809d7fc18510e8356c66a0fcc8b200c67a67
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf1f809d7fc18510e8356c66a0fcc8b200c67a67

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Sun Dec  5 13:55:59 2021 +1100

mesa: rename ir_to_mesa.{cpp,h} -> link_program.{cpp,h}

The only code now left in this file is the linking function.

Reviewed-by: Dave Airlie <airlied at redhat.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14066>

---

 src/mesa/main/ff_fragment_shader.cpp                  | 2 +-
 src/mesa/main/shaderobj.h                             | 2 +-
 src/mesa/meson.build                                  | 4 ++--
 src/mesa/program/{ir_to_mesa.cpp => link_program.cpp} | 0
 src/mesa/program/{ir_to_mesa.h => link_program.h}     | 0
 src/mesa/state_tracker/st_glsl_to_nir.cpp             | 1 -
 6 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index c40ea9586d9..c9f0a73028f 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -42,7 +42,7 @@
 #include "compiler/glsl/glsl_parser_extras.h"
 #include "compiler/glsl/glsl_symbol_table.h"
 #include "compiler/glsl_types.h"
-#include "program/ir_to_mesa.h"
+#include "program/link_program.h"
 #include "program/program.h"
 #include "program/programopt.h"
 #include "program/prog_cache.h"
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index 5900f4bc7bf..e0a434409b8 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -29,7 +29,7 @@
 
 #include "main/glheader.h"
 #include "compiler/shader_enums.h"
-#include "program/ir_to_mesa.h"
+#include "program/link_program.h"
 #include "util/macros.h"
 
 
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index b67ed0d1a34..87e857eca32 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -298,8 +298,8 @@ files_libmesa = files(
   'math/m_vector.h',
   'program/arbprogparse.c',
   'program/arbprogparse.h',
-  'program/ir_to_mesa.cpp',
-  'program/ir_to_mesa.h',
+  'program/link_program.cpp',
+  'program/link_program.h',
   'program/prog_cache.c',
   'program/prog_cache.h',
   'program/prog_execute.c',
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/link_program.cpp
similarity index 100%
rename from src/mesa/program/ir_to_mesa.cpp
rename to src/mesa/program/link_program.cpp
diff --git a/src/mesa/program/ir_to_mesa.h b/src/mesa/program/link_program.h
similarity index 100%
rename from src/mesa/program/ir_to_mesa.h
rename to src/mesa/program/link_program.h
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 4098a2ee07b..027527d4245 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -30,7 +30,6 @@
 #include "program/program.h"
 #include "program/prog_statevars.h"
 #include "program/prog_parameter.h"
-#include "program/ir_to_mesa.h"
 #include "main/context.h"
 #include "main/mtypes.h"
 #include "main/errors.h"



More information about the mesa-commit mailing list