AMD support + fixed flickering artifacts

Author: Jim Pavan

shaders/composite.fsh

@@ -186,7 +186,7 @@ void getSurfaceEffect(in vec4 stencil, inout vec4 reflectionColor, inout vec4 wa
     }
 
     color = vec4(color.rgb, 1.0) + vec4(reflectionColor.rgb, 1.0);
-    waterRawColor = mix(color, waterRawColor, 0.60);
+    waterRawColor = mix(color, waterRawColor, 0.50);
 }
 
 vec4 computeFinalWaterColor(vec4 stencil, vec4 color, float fadeAmount, bool glass, float glassAlpha, vec4 waterRawColor) {

shaders/composite_a.csh

@@ -51,8 +51,11 @@ void main() {
     Sort by order occurence number, so big water patches are reflected first (next frame)
     This leads to potentially omitting some water patches if too many planes, but the ones discarded are the smallest on screen
     */
-    int heights[PLANES] = int[PLANES](lowerWorldBound - 1);
-    int occurences[PLANES] = int[PLANES](0);
+    int heights[PLANES];
+    for (int i = 0; i < PLANES; ++i) heights[i] = lowerWorldBound - 1;
+
+    int occurences[PLANES];
+    for (int i = 0; i < PLANES; ++i) occurences[i] = 0;
 
     findBiggestWaterPatches(heights, occurences);
     layersData.waterHeights = heights;

shaders/gbuffers_skytextured.fsh

@@ -29,7 +29,7 @@ void main() {
 	}
 
 	if (mode == 1) {
-		removeHalo(texturedColor);
+		// removeHalo(texturedColor);
 
 		if (renderStage == MC_RENDER_STAGE_SUN || renderStage == MC_RENDER_STAGE_MOON) {
 			// Sun & moon fragments

shaders/gbuffers_terrain.fsh

@@ -38,7 +38,7 @@ void main() {
 	color = applyFog(color, 1.0, false);
 
 	// Terrain lighting (for darker water in deeper areas)
-	terrainLightMapForWater = clamp(pow(texture(lightmap, lmcoord), vec4(1.0)), 0.0, 1.0);
+	terrainLightMapForWater = texture(lightmap, lmcoord);
 	terrainLightMapForWater *= getVanillaLighting(n);
 
 	// Terrain mask

shaders/lang/en_US.lang

@@ -1,17 +1,23 @@
 option.INFO=Water Shader Alpha
-value.INFO.0=v1.3
+value.INFO.0=v1.4
 
 option.STYLE=Water surface style
 value.STYLE.1=§bNecrowizzard
 value.STYLE.2=§bSuperbomb17
 
 option.PLANES=Available simultaneous water levels
+option.PLANES.comment=Number of water patches at different heights handled for reflections.
 value.PLANES.1=§a 1 - Low
 value.PLANES.2=§e 2 - Medium
 value.PLANES.3=§c 3 - High
 value.PLANES.4=§4 4 - Extreme
-option.PLANES.comment=Number of water patches at different heights handled for reflections.
 
 option.SKYTEXTURED=Sun & moon reflection (§cExperimental)
 value.SKYTEXTURED.0=§cOFF
-value.SKYTEXTURED.1=§aON
+value.SKYTEXTURED.1=§aON
+
+option.REFLECTION_RESOLUTION=Resolution of reflection texture (solves flickering artifacts).
+option.REFLECTION_RESOLUTION.comment=Resolution of the shadowmap for reflections can be too small for your screen. Increase the size if you see flickering issues on reflections.
+value.REFLECTION_RESOLUTION.1=§a 1024 - Low
+value.REFLECTION_RESOLUTION.2=§e 2048 - Medium
+value.REFLECTION_RESOLUTION.3=§c 4096 - High

shaders/lib/common.glsl

@@ -66,10 +66,6 @@ uniform mat4 shadowModelViewInverse;
 // Settings for transitioning between bright and dark environments
 const float eyeBrightnessHalflife = 15.0f;
 
-// Settings for shadow pass
-const int shadowMapResolution = 2048;
-const float shadowIntervalSize = 0.0f;
-
 // Texture targets clear settings
 const bool colortex8Clear = false;
 const vec4 shadowcolor0ClearColor = vec4(0.0, 0.0, 0.0, 1.0);
@@ -99,7 +95,7 @@ const vec4 necrowizzardUnderwaterFogColorDay = vec4(0.03, 0.05, 0.12, 0.99);
 const vec4 superbomb17UnderwaterFogColorDay = vec4(0.03, 0.05, 0.12, 0.99);     // Superbomb17 fog color when underwater (daytime)
 const vec4 underwaterFogColorNight = vec4(0.02, 0.13, 0.24, 0.9);               // Fog color when underwater (nighttime)
 const float waterSurfaceTransparency = 0.35;                                                    // Water surface/texture transparency
-const float waterBlendFactor = 0.30;                                                            // How much to blend flowing water to scene
+const float waterBlendFactor = 0.40;                                                            // How much to blend flowing water to scene
 const float waterClipPlane = 1.0;                                                               // Delete vertices too close from water surface
 const float eyeCameraOffset = 1.68;                                                             // Eye camera offset from player's feet
 const float waterBlockOffset = 1.005;                                                           // Water block clipping plane height (inside block)
@@ -117,6 +113,17 @@ uniform vec2 iresolution;
 #define STYLE 1                 // Water surface style [1 2]
 #define PLANES 1                // Reflection planes allowed [1 2 3 4]
 #define SKYTEXTURED 0           // Sun & moon reflection [0 1]
+#define REFLECTION_RESOLUTION 2 // Shadow map texture resolution [1 2 3]
+
+// Settings for shadow pass
+#if REFLECTION_RESOLUTION == 1
+    const int shadowMapResolution = 1024;
+#elif REFLECTION_RESOLUTION == 2
+    const int shadowMapResolution = 2048;
+#else
+    const int shadowMapResolution = 4096;
+#endif
+const float shadowIntervalSize = 0.0f;
 
 // Shader Storage Buffer Object for water information in player view
 layout(std430, binding = 0) buffer SSBOWaterShader {

shaders/shaders.properties

@@ -6,7 +6,7 @@ bufferObject.0=1556
 bufferObject.1=4 true 1.0 1.0
 
 # Shader options
-screen=INFO STYLE PLANES SKYTEXTURED
+screen=INFO STYLE PLANES SKYTEXTURED REFLECTION_RESOLUTION
 sliders=PLANES
 screen.columns=1