Mesa (main): radv: Rename radv_shader_helper.h to radv_llvm_helper.h
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Oct 1 09:05:43 UTC 2021
Module: Mesa
Branch: main
Commit: 73e82f94c9cb0cde9c63bf6a8e74901fc4f70591
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=73e82f94c9cb0cde9c63bf6a8e74901fc4f70591
Author: Tony Wasserka <tony.wasserka at gmx.de>
Date: Fri Jun 11 12:20:59 2021 +0200
radv: Rename radv_shader_helper.h to radv_llvm_helper.h
This better reflects that the functions declared in this header are only
available with LLVM.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11319>
---
src/amd/vulkan/meson.build | 2 +-
src/amd/vulkan/radv_llvm_helper.cpp | 2 +-
src/amd/vulkan/{radv_shader_helper.h => radv_llvm_helper.h} | 0
src/amd/vulkan/radv_nir_to_llvm.c | 2 +-
src/amd/vulkan/radv_shader.c | 2 +-
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build
index e67aa992037..cbe73f83630 100644
--- a/src/amd/vulkan/meson.build
+++ b/src/amd/vulkan/meson.build
@@ -51,6 +51,7 @@ libradv_files = files(
'radv_formats.c',
'radv_image.c',
'radv_llvm_helper.cpp',
+ 'radv_llvm_helper.h',
'radv_meta.c',
'radv_meta.h',
'radv_meta_blit.c',
@@ -79,7 +80,6 @@ libradv_files = files(
'radv_shader.h',
'radv_shader_args.c',
'radv_shader_args.h',
- 'radv_shader_helper.h',
'radv_shader_info.c',
'radv_sqtt.c',
'radv_query.c',
diff --git a/src/amd/vulkan/radv_llvm_helper.cpp b/src/amd/vulkan/radv_llvm_helper.cpp
index d18a227f8d6..0341bfcc41f 100644
--- a/src/amd/vulkan/radv_llvm_helper.cpp
+++ b/src/amd/vulkan/radv_llvm_helper.cpp
@@ -20,8 +20,8 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
+#include "radv_llvm_helper.h"
#include "ac_llvm_util.h"
-#include "radv_shader_helper.h"
#include <list>
class radv_llvm_per_thread_info {
diff --git a/src/amd/vulkan/radv_shader_helper.h b/src/amd/vulkan/radv_llvm_helper.h
similarity index 100%
rename from src/amd/vulkan/radv_shader_helper.h
rename to src/amd/vulkan/radv_llvm_helper.h
diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index 797bf662e43..a741c7f7250 100644
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -27,10 +27,10 @@
#include "nir/nir.h"
#include "radv_debug.h"
+#include "radv_llvm_helper.h"
#include "radv_private.h"
#include "radv_shader.h"
#include "radv_shader_args.h"
-#include "radv_shader_helper.h"
#include "ac_binary.h"
#include "ac_exp_param.h"
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index a7c5a81c66d..427df7f209f 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -33,9 +33,9 @@
#include "util/mesa-sha1.h"
#include "util/u_atomic.h"
#include "radv_debug.h"
+#include "radv_llvm_helper.h"
#include "radv_private.h"
#include "radv_shader_args.h"
-#include "radv_shader_helper.h"
#include "util/debug.h"
#include "ac_binary.h"
More information about the mesa-commit
mailing list