From 6b6b5484c0f2faccc34dc791ac3b88061294d631 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 11 Dec 2011 12:42:48 +0100 Subject: [PATCH 1/3] Urban shader doesn't need GL_ARB_shader_texture_lod for quality level below 4.0. If needed, the shader should be split to have different requirements between levels. --- Effects/urban.eff | 65 +++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/Effects/urban.eff b/Effects/urban.eff index ef355b43b..1a0123d5d 100644 --- a/Effects/urban.eff +++ b/Effects/urban.eff @@ -48,24 +48,22 @@ 4.0 /sim/rendering/shaders/urban - - - - 2.0 - - - - GL_ARB_shader_objects - GL_ARB_shading_language_100 - GL_ARB_vertex_shader - GL_ARB_fragment_shader - - - - GL_ATI_shader_texture_lod - GL_ARB_shader_texture_lod - - + + + 2.0 + + + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + + + + GL_ATI_shader_texture_lod + GL_ARB_shader_texture_lod + @@ -295,24 +293,19 @@ 2.0 /sim/rendering/shaders/quality-level - - - - 2.0 - - - - GL_ARB_shader_objects - GL_ARB_shading_language_100 - GL_ARB_vertex_shader - GL_ARB_fragment_shader - - - - GL_ATI_shader_texture_lod - GL_ARB_shader_texture_lod - - + + + 2.0 + + + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + + + From 9a7f19a2e97c508d36a6b1bf6baaebfbc6857444 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Sun, 11 Dec 2011 14:13:17 +0100 Subject: [PATCH 2/3] Added --log-class documentation. --- Translations/strings-default.xml | 1 + options.xml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Translations/strings-default.xml b/Translations/strings-default.xml index e689a2676..2d517abf4 100644 --- a/Translations/strings-default.xml +++ b/Translations/strings-default.xml @@ -309,5 +309,6 @@ Trace the reads for a property; Trace the writes for a property; Specify which logging level to use + Specify which logging class(es) to use diff --git a/options.xml b/options.xml index 293cfd616..c3660bc22 100644 --- a/options.xml +++ b/options.xml @@ -1150,6 +1150,12 @@ strings/log-level-desc + +