fly/fgdata
1
0
Fork 0
Code Activity

Correct extension handling in the urban fragment shader.

Browse source
This commit is contained in:
Mathias Froehlich 2011-12-08 08:58:36 +01:00
parent 65552ff537
commit 8eaedfae57
2 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
Effects/urban.eff
View file

@ -48,18 +48,24 @@
<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>
<or> <and>
<less-equal> <or>
<value type="float">2.0</value> <less-equal>
<glversion/> <value type="float">2.0</value>
</less-equal> <glversion/>
<and> </less-equal>
<extension-supported>GL_ARB_shader_objects</extension-supported> <and>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
</and> <extension-supported>GL_ARB_fragment_shader</extension-supported>
</or> </and>
</or>
<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>
@ -289,18 +295,24 @@
<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>
<or> <and>
<less-equal> <or>
<value type="float">2.0</value> <less-equal>
<glversion/> <value type="float">2.0</value>
</less-equal> <glversion/>
<and> </less-equal>
<extension-supported>GL_ARB_shader_objects</extension-supported> <and>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
</and> <extension-supported>GL_ARB_fragment_shader</extension-supported>
</or> </and>
</or>
<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>

1
Shaders/urban.frag
View file

@ -7,6 +7,7 @@
#version 120 #version 120
#extension GL_ATI_shader_texture_lod : enable #extension GL_ATI_shader_texture_lod : enable
#extension GL_ARB_shader_texture_lod : enable
#define TEXTURE_MIP_LEVELS 10 #define TEXTURE_MIP_LEVELS 10
#define TEXTURE_PIX_COUNT 1024 //pow(2,TEXTURE_MIP_LEVELS) #define TEXTURE_PIX_COUNT 1024 //pow(2,TEXTURE_MIP_LEVELS)