EEVEE: Move Closure definitions to gpu_shader_codegen_lib.glsleevee-rewrite

This way they can be used as inputs to the closure eval functions.

2 files changed, 36 insertions, 36 deletions

diff --git a/source/blender/draw/engines/eevee/shaders/eevee_closure_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_closure_lib.glsl
index d255b9ad7a3..fb252ef7c88 100644
--- a/source/blender/draw/engines/eevee/shaders/eevee_closure_lib.glsl
+++ b/source/blender/draw/engines/eevee/shaders/eevee_closure_lib.glsl
@@ -1,40 +1,4 @@
 
-struct ClosureDiffuse {
-  vec3 color;
-  vec3 N;
-  vec3 sss_radius;
-  uint sss_id;
-};
-
-struct ClosureReflection {
-  vec3 color;
-  vec3 N;
-  float roughness;
-};
-
-struct ClosureRefraction {
-  vec3 color;
-  vec3 N;
-  float roughness;
-  float ior;
-};
-
-struct ClosureVolume {
-  vec3 emission;
-  vec3 scattering;
-  vec3 transmittance;
-  float anisotropy;
-};
-
-struct ClosureEmission {
-  vec3 emission;
-};
-
-struct ClosureTransparency {
-  vec3 transmittance;
-  float holdout;
-};
-
 /* We use the weight tree pre-evaluation to weight the closures.
  * There is no need for the Closure type. */
 struct Closure {
diff --git a/source/blender/gpu/shaders/gpu_shader_codegen_lib.glsl b/source/blender/gpu/shaders/gpu_shader_codegen_lib.glsl
index 086ff5b0217..e0523ab0619 100644
--- a/source/blender/gpu/shaders/gpu_shader_codegen_lib.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_codegen_lib.glsl
@@ -26,3 +26,39 @@
 #else
 #  define FrontFacing true
 #endif
+
+struct ClosureDiffuse {
+  vec3 color;
+  vec3 N;
+  vec3 sss_radius;
+  uint sss_id;
+};
+
+struct ClosureReflection {
+  vec3 color;
+  vec3 N;
+  float roughness;
+};
+
+struct ClosureRefraction {
+  vec3 color;
+  vec3 N;
+  float roughness;
+  float ior;
+};
+
+struct ClosureVolume {
+  vec3 emission;
+  vec3 scattering;
+  vec3 transmittance;
+  float anisotropy;
+};
+
+struct ClosureEmission {
+  vec3 emission;
+};
+
+struct ClosureTransparency {
+  vec3 transmittance;
+  float holdout;
+};