display error message when using both DH and voxy at the same time...

This commit is contained in:
Merlin1809
2026-04-19 21:45:29 +02:00
parent ae504208ad
commit 606a0cfdc1
3 changed files with 18 additions and 3 deletions
-2
View File
@@ -19,10 +19,8 @@ uniform sampler2D noisetex;
const bool shadowHardwareFiltering = true;
uniform sampler2DShadow shadowtex0HW;
#ifdef DISTANT_HORIZONS
uniform sampler2D dhDepthTex;
uniform sampler2D dhDepthTex1;
#endif
uniform sampler2D depthtex0;
uniform sampler2D depthtex1;
+14 -1
View File
@@ -15,7 +15,7 @@ uniform sampler2D depthtex2;
uniform sampler2D noisetex;
uniform sampler2D shadowcolor1;
#if !defined IS_IRIS || (defined SHADER_GRASS_SETTING && MC_VERSION < 12101 && !defined SHADER_GRASS_UNSUPPORTED_FIX)
#if !defined IS_IRIS || (defined SHADER_GRASS_SETTING && MC_VERSION < 12101 && !defined SHADER_GRASS_UNSUPPORTED_FIX) || defined EXPLODE_THE_SHADER
#include "/lib/text_rendering.glsl"
#endif
@@ -303,4 +303,17 @@ void main() {
gl_FragColor.rgb = vec3(texture(colortex15, texcoord).rgb);
#endif
#endif
#ifdef EXPLODE_THE_SHADER
gl_FragColor.rgb = vec3(0.0);
beginText(ivec2(gl_FragCoord.xy/vec2(6.0, 8.0)), ivec2(0.05*viewWidth/6.0, 0.75*viewHeight/8.0));
text.fgCol = vec4(1.0, 0.0, 0.0, 1.0);
printString((_D, _o, _space, _N, _O, _T, _space, _u, _s, _e, _space, _b, _o, _t, _h, _space, _D, _i, _s, _t, _a, _n, _t, _space, _H, _o, _r, _i, _z, _o, _n, _s, _space));
printLine();
printString((_a, _n, _d, _space, _V, _o, _x, _y, _space, _t, _o, _g, _e, _t, _h, _e, _r, _exclm));
printLine();
printLine();
printString((_D, _i, _s, _a, _b, _l, _e, _space, _o, _n, _e, _space, _o, _f, _space, _t, _h, _e, _m, _exclm));
endText(gl_FragColor.rgb);
#endif
}
+4
View File
@@ -1369,6 +1369,10 @@ const vec3 aerochrome_color = mix(vec3(1.0, 0.0, 0.0), vec3(0.715, 0.303, 0.631)
#undef CLOUDS_SHADOWS
#endif
#if defined VOXY && defined DISTANT_HORIZONS
#define EXPLODE_THE_SHADER
#endif
#ifdef VOXY
#undef DISTANT_HORIZONS
#endif