From be1c8c6fd2e44130e43ade476b19c605880d45da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= <turanszkij@gmail.com>
Date: Wed, 28 May 2025 09:27:34 +0200
Subject: [PATCH] some more shader functions changed to macros

---
 WickedEngine/shaders/emittedparticleHF.hlsli | 15 +++------------
 WickedEngine/shaders/hairparticleHF.hlsli    | 15 +++------------
 WickedEngine/shaders/objectHF.hlsli          | 10 ++--------
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/WickedEngine/shaders/emittedparticleHF.hlsli b/WickedEngine/shaders/emittedparticleHF.hlsli
index e016e40f3..fdfcaf96d 100644
--- a/WickedEngine/shaders/emittedparticleHF.hlsli
+++ b/WickedEngine/shaders/emittedparticleHF.hlsli
@@ -3,18 +3,9 @@
 #include "globals.hlsli"
 #include "ShaderInterop_EmittedParticle.h"
 
-ShaderMeshInstance EmitterGetInstance()
-{
-	return load_instance(xEmitterInstanceIndex);
-}
-ShaderGeometry EmitterGetGeometry()
-{
-	return load_geometry(EmitterGetInstance().geometryOffset);
-}
-ShaderMaterial EmitterGetMaterial()
-{
-	return load_material(EmitterGetGeometry().materialIndex);
-}
+#define EmitterGetInstance() (load_instance(xEmitterInstanceIndex))
+#define EmitterGetGeometry() (load_geometry(EmitterGetInstance().geometryOffset))
+#define EmitterGetMaterial() (load_material(EmitterGetGeometry().materialIndex))
 
 struct VertextoPixel
 {
diff --git a/WickedEngine/shaders/hairparticleHF.hlsli b/WickedEngine/shaders/hairparticleHF.hlsli
index 8a306b6b1..0274506dc 100644
--- a/WickedEngine/shaders/hairparticleHF.hlsli
+++ b/WickedEngine/shaders/hairparticleHF.hlsli
@@ -3,18 +3,9 @@
 #include "globals.hlsli"
 #include "ShaderInterop_HairParticle.h"
 
-ShaderMeshInstance HairGetInstance()
-{
-	return load_instance(xHairInstanceIndex);
-}
-ShaderGeometry HairGetGeometry()
-{
-	return load_geometry(HairGetInstance().geometryOffset);
-}
-ShaderMaterial HairGetMaterial()
-{
-	return load_material(HairGetGeometry().materialIndex);
-}
+#define HairGetInstance() (load_instance(xHairInstanceIndex))
+#define HairGetGeometry() (load_geometry(HairGetInstance().geometryOffset))
+#define HairGetMaterial() (load_material(HairGetGeometry().materialIndex))
 
 struct VertexToPixel
 {
diff --git a/WickedEngine/shaders/objectHF.hlsli b/WickedEngine/shaders/objectHF.hlsli
index 1a833bbeb..e36399c62 100644
--- a/WickedEngine/shaders/objectHF.hlsli
+++ b/WickedEngine/shaders/objectHF.hlsli
@@ -49,14 +49,8 @@
 
 PUSHCONSTANT(push, ObjectPushConstants);
 
-inline ShaderGeometry GetMesh()
-{
-	return load_geometry(push.geometryIndex);
-}
-inline ShaderMaterial GetMaterial()
-{
-	return load_material(push.materialIndex);
-}
+#define GetMesh() (load_geometry(push.geometryIndex))
+#define GetMaterial() (load_material(push.materialIndex))
 
 #define sampler_objectshader bindless_samplers[descriptor_index(GetMaterial().sampler_descriptor)]