Skip to content
Snippets Groups Projects
Commit fe734ddf authored by Graham Linden's avatar Graham Linden
Browse files

SL-11056

Make OpenGL 3.3 cards not false alarm on version 140 shader reqs.
Makes deferred rendering work on low-end GPUs more often.
parent 4fe71c1d
No related branches found
No related tags found
No related merge requests found
...@@ -705,7 +705,31 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade ...@@ -705,7 +705,31 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
} }
else else
{ {
if (major_version < 4) if (major_version >= 4)
{
//set version to 400
shader_code_text[shader_code_count++] = strdup("#version 400\n");
}
else if (major_version == 3)
{
if (minor_version < 10)
{
shader_code_text[shader_code_count++] = strdup("#version 300\n");
}
else if (minor_version <= 19)
{
shader_code_text[shader_code_count++] = strdup("#version 310\n");
}
else if (minor_version <= 29)
{
shader_code_text[shader_code_count++] = strdup("#version 320\n");
}
else
{
shader_code_text[shader_code_count++] = strdup("#version 330\n");
}
}
else
{ {
//set version to 1.30 //set version to 1.30
shader_code_text[shader_code_count++] = strdup("#version 130\n"); shader_code_text[shader_code_count++] = strdup("#version 130\n");
...@@ -713,10 +737,6 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade ...@@ -713,10 +737,6 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
extra_code_text[extra_code_count++] = strdup("precision mediump int;\n"); extra_code_text[extra_code_count++] = strdup("precision mediump int;\n");
extra_code_text[extra_code_count++] = strdup("precision highp float;\n"); extra_code_text[extra_code_count++] = strdup("precision highp float;\n");
} }
else
{ //set version to 400
shader_code_text[shader_code_count++] = strdup("#version 400\n");
}
extra_code_text[extra_code_count++] = strdup("#define DEFINE_GL_FRAGCOLOR 1\n"); extra_code_text[extra_code_count++] = strdup("#define DEFINE_GL_FRAGCOLOR 1\n");
extra_code_text[extra_code_count++] = strdup("#define FXAA_GLSL_130 1\n"); extra_code_text[extra_code_count++] = strdup("#define FXAA_GLSL_130 1\n");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment