add missing preprocess check, rm spurious isocontour uniforms

yt-project · Dec 10, 2024 · 265bb9e · 265bb9e
1 parent db21fa6
commit 265bb9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/yt_idv/shaders/known_uniforms.inc.glsl b/yt_idv/shaders/known_uniforms.inc.glsl
@@ -57,9 +57,6 @@ uniform vec4 curve_rgba;
 // isocontour control
 uniform int iso_num_layers;
 uniform float iso_layers[32];
-uniform bool iso_log;
-uniform float iso_min;
-uniform float iso_max;
 uniform float iso_layer_tol[32];
 uniform float iso_alphas[32];
 

diff --git a/yt_idv/shaders/ray_tracing.frag.glsl b/yt_idv/shaders/ray_tracing.frag.glsl
@@ -5,9 +5,13 @@ flat in vec3 right_edge;
 flat in mat4 inverse_proj;
 flat in mat4 inverse_mvm;
 flat in mat4 inverse_pmvm;
+flat in ivec3 texture_offset;
+
+#ifdef SPHERICAL_GEOM
 flat in vec3 left_edge_cart;
 flat in vec3 right_edge_cart;
-flat in ivec3 texture_offset;
+#endif
+
 out vec4 output_color;
 
 bool within_bb(vec3 pos)