new cvar: r_glsl_offsetmapping_reliefmapping_refinesteps (default 5)

[xonotic/darkplaces.git] / shader_glsl.h

diff --git a/shader_glsl.h b/shader_glsl.h
index ae82899ddfedaeddb7e5749adc46256b3ba2d070..23f3946ceee7cdafe0aee5bc8b66d31806cf9ab2 100644 (file)
--- a/shader_glsl.h
+++ b/shader_glsl.h
@@ -606,11 +606,12 @@
 "#endif\n"
 "\n"
 "#ifdef USEOFFSETMAPPING\n"
-"uniform mediump vec3 OffsetMapping_ScaleSteps;\n"
+"uniform mediump vec4 OffsetMapping_ScaleSteps;\n"
 "vec2 OffsetMapping(vec2 TexCoord, vec2 dPdx, vec2 dPdy)\n"
 "{\n"
 "      float i;\n"
 "#ifdef USEOFFSETMAPPING_RELIEFMAPPING\n"
+"      float f;\n"
 "      // 14 sample relief mapping: linear search and then binary search\n"
 "      // this basically steps forward a small amount repeatedly until it finds\n"
 "      // itself inside solid, then jitters forward and back using decreasing\n"
@@ -622,11 +623,8 @@
 "      OffsetVector *= OffsetMapping_ScaleSteps.z;\n"
 "      for(i = 1.0; i < OffsetMapping_ScaleSteps.y; ++i)\n"
 "              RT += OffsetVector *  step(dp_textureGrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z);\n"
-"      RT += OffsetVector * (step(dp_textureGrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z)          - 0.5);\n"
-"      RT += OffsetVector * (step(dp_textureGrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z) * 0.5    - 0.25);\n"
-"      RT += OffsetVector * (step(dp_textureGrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z) * 0.25   - 0.125);\n"
-"      RT += OffsetVector * (step(dp_textureGrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z) * 0.125  - 0.0625);\n"
-"      RT += OffsetVector * (step(dp_textureGrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z) * 0.0625 - 0.03125);\n"
+"      for(i = 0.0, f = 1.0; i < OffsetMapping_ScaleSteps.w; ++i, f *= 0.5)\n"
+"              RT += OffsetVector * (step(dp_textureGrad(Texture_Normal, RT.xy, dPdx, dPdy).a, RT.z) * f - 0.5 * f);\n"
 "      return RT.xy;\n"
 "#else\n"
 "      // 2 sample offset mapping (only 2 samples because of ATI Radeon 9500-9800/X300 limits)\n"