fly/fgdata
1
0
Fork 0
Code Activity

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.

Browse source
This commit is contained in:
Frederic Bouvier 2011-12-11 12:42:48 +01:00
parent d530df428d
commit 6b6b5484c0
1 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Effects/urban.eff
View file

@ -48,24 +48,22 @@
<value type="float">4.0</value> <value type="float">4.0</value>
<float-property>/sim/rendering/shaders/urban</float-property> <float-property>/sim/rendering/shaders/urban</float-property>
</less-equal> </less-equal>
<and> <or>
<or> <less-equal>
<less-equal> <value type="float">2.0</value>
<value type="float">2.0</value> <glversion/>
<glversion/> </less-equal>
</less-equal> <and>
<and> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shader_objects</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_fragment_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> </and>
</and> </or>
</or> <or>
<or> <extension-supported>GL_ATI_shader_texture_lod</extension-supported>
<extension-supported>GL_ATI_shader_texture_lod</extension-supported> <extension-supported>GL_ARB_shader_texture_lod</extension-supported>
<extension-supported>GL_ARB_shader_texture_lod</extension-supported> </or>
</or>
</and>
</and> </and>
</predicate> </predicate>
<pass> <pass>
@ -295,24 +293,19 @@
<value type="float">2.0</value> <value type="float">2.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property> <float-property>/sim/rendering/shaders/quality-level</float-property>
</less-equal> </less-equal>
<and> <or>
<or> <less-equal>
<less-equal> <value type="float">2.0</value>
<value type="float">2.0</value> <glversion/>
<glversion/> </less-equal>
</less-equal> <and>
<and> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shader_objects</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_fragment_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> </and>
</and> </or>
</or> <!-- quality level below 4.0 doesn't require GL_ATI_shader_texture_lod or GL_ARB_shader_texture_lod -->
<or>
<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
</or>
</and>
</and> </and>
</predicate> </predicate>
<pass> <pass>