merian-shaders: Move colors_ to subdirectory

LDAP · Aug 13, 2024 · 4fc8cfe · 4fc8cfe
1 parent d24e1b6
commit 4fc8cfe
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 15 deletions.
diff --git a/include/merian-shaders/colors_dng.glsl → include/merian-shaders/color/colors_dng.glsl b/include/merian-shaders/colors_dng.glsl → include/merian-shaders/color/colors_dng.glsl
diff --git a/include/merian-shaders/colors_dtucs.glsl → ...de/merian-shaders/color/colors_dtucs.glsl b/include/merian-shaders/colors_dtucs.glsl → ...de/merian-shaders/color/colors_dtucs.glsl
diff --git a/include/merian-shaders/colors_munsell.glsl → .../merian-shaders/color/colors_munsell.glsl b/include/merian-shaders/colors_munsell.glsl → .../merian-shaders/color/colors_munsell.glsl
@@ -1,4 +1,4 @@
-#include "common.glsl"
+#include "merian-shaders/common.glsl"
 
 #ifndef _COLORS_MUNSELL_H_
 #define _COLORS_MUNSELL_H_

diff --git a/include/merian-shaders/colors_rec2020.glsl → .../merian-shaders/color/colors_rec2020.glsl b/include/merian-shaders/colors_rec2020.glsl → .../merian-shaders/color/colors_rec2020.glsl
diff --git a/include/merian-shaders/colors_srgb.glsl → ...ude/merian-shaders/color/colors_srgb.glsl b/include/merian-shaders/colors_srgb.glsl → ...ude/merian-shaders/color/colors_srgb.glsl
diff --git a/include/merian-shaders/colors_xyz.glsl → include/merian-shaders/color/colors_xyz.glsl b/include/merian-shaders/colors_xyz.glsl → include/merian-shaders/color/colors_xyz.glsl
diff --git a/include/merian-shaders/colors_yuv.glsl → include/merian-shaders/color/colors_yuv.glsl b/include/merian-shaders/colors_yuv.glsl → include/merian-shaders/color/colors_yuv.glsl
diff --git a/include/merian-shaders/tonemap.glsl b/include/merian-shaders/tonemap.glsl
@@ -1,5 +1,5 @@
-#include "merian-shaders/colors_yuv.glsl"
-#include "merian-shaders/colors_srgb.glsl"
+#include "merian-shaders/color/colors_yuv.glsl"
+#include "merian-shaders/color/colors_srgb.glsl"
 #include "merian-shaders/common.glsl"
 
 #ifndef _TONEMAP_H_

diff --git a/src/merian-nodes/nodes/accumulate/accumulate.comp b/src/merian-nodes/nodes/accumulate/accumulate.comp
@@ -35,7 +35,7 @@ layout(push_constant, std140) uniform pc_t {
 
 #include "merian-shaders/normal_encode.glsl"
 #include "merian-shaders/reprojection.glsl"
-#include "merian-shaders/colors_yuv.glsl"
+#include "merian-shaders/color/colors_yuv.glsl"
 
 void get_prev_nearest(const vec2 prev_pos,
                       const float linear_z,

diff --git a/src/merian-nodes/nodes/accumulate/calculate_percentiles.comp b/src/merian-nodes/nodes/accumulate/calculate_percentiles.comp
@@ -3,7 +3,7 @@
 
 #include "graph_layout.glsl"
 
-#include "merian-shaders/colors_yuv.glsl"
+#include "merian-shaders/color/colors_yuv.glsl"
 
 layout(set = 1, binding = 0) uniform writeonly restrict image2D img_quartiles;
 

diff --git a/src/merian-nodes/nodes/bloom/bloom_separate.comp b/src/merian-nodes/nodes/bloom/bloom_separate.comp
@@ -2,7 +2,7 @@
 #extension GL_GOOGLE_include_directive    : enable
 
 #include "layout.glsl"
-#include "merian-shaders/colors_yuv.glsl"
+#include "merian-shaders/color/colors_yuv.glsl"
 
 void main() {
   const ivec2 ipos = ivec2(gl_GlobalInvocationID);

diff --git a/src/merian-nodes/nodes/exposure/exposure.comp b/src/merian-nodes/nodes/exposure/exposure.comp
@@ -3,7 +3,7 @@
 
 #include "layout.glsl"
 #include "merian-shaders/camera.glsl"
-#include "merian-shaders/colors_yuv.glsl"
+#include "merian-shaders/color/colors_yuv.glsl"
 
 void main() {
   const ivec2 ipos = ivec2(gl_GlobalInvocationID);

diff --git a/src/merian-nodes/nodes/exposure/histogram.comp b/src/merian-nodes/nodes/exposure/histogram.comp
@@ -2,7 +2,7 @@
 #extension GL_GOOGLE_include_directive    : enable
 
 #include "layout.glsl"
-#include "merian-shaders/colors_xyz.glsl"
+#include "merian-shaders/color/colors_xyz.glsl"
 
 const uint hist_size = gl_WorkGroupSize.x * gl_WorkGroupSize.y;
 shared uint[hist_size] local_hist;

diff --git a/src/merian-nodes/nodes/image_write/image_write.cpp b/src/merian-nodes/nodes/image_write/image_write.cpp
@@ -101,7 +101,8 @@ void ImageWrite::process(GraphRun& run,
             std::abs(time_millis - optimal_timing) <
                 std::abs(time_millis + estimated_frametime_millis - optimal_timing)) {
             record_next = true;
-            if ((undersampling = (frametime_millis > record_frametime_millis)))
+            undersampling = (frametime_millis > record_frametime_millis);
+            if (undersampling)
                 SPDLOG_WARN("undersampling, video may stutter");
         }
     }

diff --git a/src/merian-nodes/nodes/svgf/svgf_filter.comp b/src/merian-nodes/nodes/svgf/svgf_filter.comp
@@ -3,7 +3,7 @@
 #extension GL_EXT_control_flow_attributes : enable
 
 #include "svgf_graph_layout.glsl"
-#include "merian-shaders/colors_yuv.glsl"
+#include "merian-shaders/color/colors_yuv.glsl"
 #include "merian-shaders/normal_encode.glsl"
 
 layout(set = 1, binding = 0) uniform sampler2D img_filter_in;

diff --git a/src/merian-nodes/nodes/svgf/svgf_variance_estimate.comp b/src/merian-nodes/nodes/svgf/svgf_variance_estimate.comp
@@ -4,7 +4,7 @@
 
 #include "svgf_graph_layout.glsl"
 #include "merian-shaders/normal_encode.glsl"
-#include "merian-shaders/colors_yuv.glsl"
+#include "merian-shaders/color/colors_yuv.glsl"
 #include "config.h"
 
 /*

diff --git a/src/merian-nodes/nodes/vkdt_filmcurv/vkdt_filmcurv.comp b/src/merian-nodes/nodes/vkdt_filmcurv/vkdt_filmcurv.comp
@@ -3,10 +3,10 @@
 #extension GL_EXT_nonuniform_qualifier    : enable
 #extension GL_EXT_shader_explicit_arithmetic_types_float16 : enable
 
-#include "merian-shaders/colors_rec2020.glsl"
-#include "merian-shaders/colors_dng.glsl"
-#include "merian-shaders/colors_dtucs.glsl"
-#include "merian-shaders/colors_munsell.glsl"
+#include "merian-shaders/color/colors_rec2020.glsl"
+#include "merian-shaders/color/colors_dng.glsl"
+#include "merian-shaders/color/colors_dtucs.glsl"
+#include "merian-shaders/color/colors_munsell.glsl"
 
 layout(local_size_x_id = 0, local_size_y_id = 1) in;