diff options
| author | Vitaliy <numzer0@yandex.ru> | 2020-12-19 22:57:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 20:57:10 +0100 |
| commit | ccbf8029ea6bfc5bb5d4af340bd4c2c0d58fe0ff (patch) | |
| tree | 9bb8bf7b22d44a45e7a1efd400f465e21ca3d8c9 /client/shaders | |
| parent | 664f5ce9605b580b9500547fff1e54eac553f295 (diff) | |
| download | minetest-ccbf8029ea6bfc5bb5d4af340bd4c2c0d58fe0ff.tar.gz minetest-ccbf8029ea6bfc5bb5d4af340bd4c2c0d58fe0ff.tar.bz2 minetest-ccbf8029ea6bfc5bb5d4af340bd4c2c0d58fe0ff.zip | |
Cleanup shader generation code (#10663)
Shader generation is a mess. This commit cleans some parts up, including dropping remains of HLSL support which was never actually implemented.
Diffstat (limited to 'client/shaders')
| -rw-r--r-- | client/shaders/nodes_shader/opengl_fragment.glsl | 4 | ||||
| -rw-r--r-- | client/shaders/object_shader/opengl_fragment.glsl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl index b0f6d45d0..b5d85da64 100644 --- a/client/shaders/nodes_shader/opengl_fragment.glsl +++ b/client/shaders/nodes_shader/opengl_fragment.glsl @@ -22,7 +22,7 @@ varying vec3 eyeVec; const float fogStart = FOG_START; const float fogShadingParameter = 1.0 / ( 1.0 - fogStart); -#ifdef ENABLE_TONE_MAPPING +#if ENABLE_TONE_MAPPING /* Hable's UC2 Tone mapping parameters A = 0.22; @@ -73,7 +73,7 @@ void main(void) vec4 col = vec4(color.rgb * varColor.rgb, 1.0); -#ifdef ENABLE_TONE_MAPPING +#if ENABLE_TONE_MAPPING col = applyToneMapping(col); #endif diff --git a/client/shaders/object_shader/opengl_fragment.glsl b/client/shaders/object_shader/opengl_fragment.glsl index bf18c1499..12cc54ae7 100644 --- a/client/shaders/object_shader/opengl_fragment.glsl +++ b/client/shaders/object_shader/opengl_fragment.glsl @@ -19,7 +19,7 @@ const float BS = 10.0; const float fogStart = FOG_START; const float fogShadingParameter = 1.0 / (1.0 - fogStart); -#ifdef ENABLE_TONE_MAPPING +#if ENABLE_TONE_MAPPING /* Hable's UC2 Tone mapping parameters A = 0.22; @@ -75,7 +75,7 @@ void main(void) col.rgb *= emissiveColor.rgb * vIDiff; -#ifdef ENABLE_TONE_MAPPING +#if ENABLE_TONE_MAPPING col = applyToneMapping(col); #endif |