ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update graphical restrictions

Browse Source 
Mesa 17.4 will use the correct normalization forumla

Disable GLSL on intel HD2000 / HD3000 due to broken opengl 3.3 support
This commit is contained in:
Benau 2018-01-08 15:55:28 +08:00
parent 57fad498f8
commit 54c7914cb5
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/graphical_restrictions.xml
View File

@ -2,16 +2,16 @@
<graphical-restrictions> <graphical-restrictions>
<card is="Intel(R) HD Graphics" os="windows" version="<9.0" disable="ForceLegacyDevice"/> <card is="Intel(R) HD Graphics" os="windows" version="<9.0" disable="ForceLegacyDevice"/>
<card is="Intel(R) HD Graphics" os="windows" version="<9.0" disable="HighDefinitionTextures"/> <card is="Intel(R) HD Graphics" os="windows" version="<9.0" disable="HighDefinitionTextures"/>
<card is="Intel(R) HD Graphics 2000" os="windows" disable="10BitVector"/> <card is="Intel(R) HD Graphics 2000" os="windows" disable="ForceLegacyDevice"/>
<card is="Intel(R) HD Graphics 2000" os="windows" disable="HighDefinitionTextures"/> <card is="Intel(R) HD Graphics 2000" os="windows" disable="HighDefinitionTextures"/>
<card is="Intel(R) HD Graphics 3000" os="windows" disable="10BitVector"/> <card is="Intel(R) HD Graphics 3000" os="windows" disable="ForceLegacyDevice"/>
<card is="Intel(R) HD Graphics 3000" os="windows" disable="HighDefinitionTextures"/> <card is="Intel(R) HD Graphics 3000" os="windows" disable="HighDefinitionTextures"/>
<card is="Intel(R) HD Graphics 4600" os="windows" disable="ComputeShader"/> <card is="Intel(R) HD Graphics 4600" os="windows" disable="ComputeShader"/>
<card contains="Intel" os="osx" disable="GI"/> <card contains="Intel" os="osx" disable="GI"/>
<card contains="Intel" os="linux" version="<11.2" disable="ComputeShader"/> <card contains="Intel" os="linux" version="<11.2" disable="ComputeShader"/>
<card contains="Intel" os="linux" version="<11.2" disable="GeometryShader"/> <card contains="Intel" os="linux" version="<11.2" disable="GeometryShader"/>
<card contains="Ivybridge" os="linux" disable="10BitVector"/> <card contains="Ivybridge" os="linux" version="<17.4" disable="Correct10bitNormalization"/>
<card contains="Sandybridge" os="linux" disable="10BitVector"/> <card contains="Sandybridge" os="linux" version="<17.4" disable="Correct10bitNormalization"/>
<card contains="Intel" os="linux" version="<11.2" disable="TextureCompressionS3TC"/> <card contains="Intel" os="linux" version="<11.2" disable="TextureCompressionS3TC"/>
<card contains="Intel" os="osx" disable="TextureCompressionS3TC"/> <card contains="Intel" os="osx" disable="TextureCompressionS3TC"/>
<card contains="NVIDIA" os="windows" version="<344.65" disable="BufferStorage"/> <card contains="NVIDIA" os="windows" version="<344.65" disable="BufferStorage"/>

2
src/graphics/graphics_restrictions.cpp
View File

@ -71,7 +71,7 @@ namespace GraphicsRestrictions
"HighDefinitionTextures", "HighDefinitionTextures",
"HighDefinitionTextures256", "HighDefinitionTextures256",
"AdvancedPipeline", "AdvancedPipeline",
"10BitVector", "Correct10bitNormalization",
"GI", "GI",
"ForceLegacyDevice", "ForceLegacyDevice",
"VertexIdWorking", "VertexIdWorking",

2
src/graphics/graphics_restrictions.hpp
View File

@ -58,7 +58,7 @@ namespace GraphicsRestrictions
GR_HIGHDEFINITION_TEXTURES, GR_HIGHDEFINITION_TEXTURES,
GR_HIGHDEFINITION_TEXTURES_256, GR_HIGHDEFINITION_TEXTURES_256,
GR_ADVANCED_PIPELINE, GR_ADVANCED_PIPELINE,
GR_10BIT_VECTOR, GR_CORRECT_10BIT_NORMALIZATION,
GR_GI, GR_GI,
GR_FORCE_LEGACY_DEVICE, GR_FORCE_LEGACY_DEVICE,
GR_VERTEX_ID_WORKING, GR_VERTEX_ID_WORKING,

2
src/graphics/shader_files_manager.cpp
View File

@ -165,7 +165,7 @@ GLuint ShaderFilesManager::loadShader(const std::string &file, unsigned type)
} }
if (GraphicsRestrictions::isDisabled if (GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR)) (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION))
{ {
code << "#define Converts_10bit_Vector\n"; code << "#define Converts_10bit_Vector\n";
} }

12
src/graphics/sp/sp_dynamic_draw_call.cpp
View File

@ -78,8 +78,8 @@ SPDynamicDrawCall::SPDynamicDrawCall(scene::E_PRIMITIVE_TYPE pt,
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 4, GL_INT_2_10_10_10_REV, glVertexAttribPointer(1, 4, GL_INT_2_10_10_10_REV,
GraphicsRestrictions::isDisabled GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR) ? GL_FALSE : GL_TRUE, 48, (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION) ?
(void*)offset); GL_FALSE : GL_TRUE, 48, (void*)offset);
offset += 4; offset += 4;
// Vertex color // Vertex color
@ -102,8 +102,8 @@ SPDynamicDrawCall::SPDynamicDrawCall(scene::E_PRIMITIVE_TYPE pt,
glEnableVertexAttribArray(5); glEnableVertexAttribArray(5);
glVertexAttribPointer(5, 4, GL_INT_2_10_10_10_REV, glVertexAttribPointer(5, 4, GL_INT_2_10_10_10_REV,
GraphicsRestrictions::isDisabled GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR) ? GL_FALSE : GL_TRUE, (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION) ?
48, (void*)offset); GL_FALSE : GL_TRUE, 48, (void*)offset);
offset += 4; offset += 4;
// 4 Joint indices // 4 Joint indices
@ -125,8 +125,8 @@ SPDynamicDrawCall::SPDynamicDrawCall(scene::E_PRIMITIVE_TYPE pt,
glEnableVertexAttribArray(9); glEnableVertexAttribArray(9);
glVertexAttribPointer(9, 4, GL_INT_2_10_10_10_REV, glVertexAttribPointer(9, 4, GL_INT_2_10_10_10_REV,
GraphicsRestrictions::isDisabled GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR) ? GL_FALSE : GL_TRUE, 32 + 48, (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION) ?
(void*)12); GL_FALSE : GL_TRUE, 32 + 48, (void*)12);
glVertexAttribDivisorARB(9, 1); glVertexAttribDivisorARB(9, 1);
// Scale (3 half floats and .w for quaternion .w) // Scale (3 half floats and .w for quaternion .w)
glEnableVertexAttribArray(10); glEnableVertexAttribArray(10);

10
src/graphics/sp/sp_mesh_buffer.cpp
View File

@ -318,8 +318,8 @@ void SPMeshBuffer::recreateVAO(unsigned i)
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 4, GL_INT_2_10_10_10_REV, glVertexAttribPointer(1, 4, GL_INT_2_10_10_10_REV,
GraphicsRestrictions::isDisabled GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR) ? GL_FALSE : GL_TRUE, pitch, (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION) ?
(void*)offset); GL_FALSE : GL_TRUE, pitch, (void*)offset);
offset += 4; offset += 4;
// Vertex color // Vertex color
@ -351,8 +351,8 @@ void SPMeshBuffer::recreateVAO(unsigned i)
glEnableVertexAttribArray(5); glEnableVertexAttribArray(5);
glVertexAttribPointer(5, 4, GL_INT_2_10_10_10_REV, glVertexAttribPointer(5, 4, GL_INT_2_10_10_10_REV,
GraphicsRestrictions::isDisabled GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR) ? GL_FALSE : GL_TRUE, (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION) ?
pitch, (void*)offset); GL_FALSE : GL_TRUE, pitch, (void*)offset);
offset += 4; offset += 4;
} }
else else
@ -418,7 +418,7 @@ void SPMeshBuffer::recreateVAO(unsigned i)
glEnableVertexAttribArray(9); glEnableVertexAttribArray(9);
glVertexAttribPointer(9, 4, GL_INT_2_10_10_10_REV, glVertexAttribPointer(9, 4, GL_INT_2_10_10_10_REV,
GraphicsRestrictions::isDisabled GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR) ? GL_FALSE : GL_TRUE, 32, (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION) ? GL_FALSE : GL_TRUE, 32,
(void*)12); (void*)12);
glVertexAttribDivisorARB(9, 1); glVertexAttribDivisorARB(9, 1);
// Scale (3 half floats and .w for quaternion .w) // Scale (3 half floats and .w for quaternion .w)

4
src/graphics/stk_text_billboard.cpp
View File

@ -220,8 +220,8 @@ void STKTextBillboard::init(core::stringw text, FontWithFace* face)
glEnableVertexAttribArray(9); glEnableVertexAttribArray(9);
glVertexAttribPointer(9, 4, GL_INT_2_10_10_10_REV, glVertexAttribPointer(9, 4, GL_INT_2_10_10_10_REV,
GraphicsRestrictions::isDisabled GraphicsRestrictions::isDisabled
(GraphicsRestrictions::GR_10BIT_VECTOR) ? GL_FALSE : GL_TRUE, 24, (GraphicsRestrictions::GR_CORRECT_10BIT_NORMALIZATION) ?
(void*)12); GL_FALSE : GL_TRUE, 24, (void*)12);
glVertexAttribDivisorARB(9, 1); glVertexAttribDivisorARB(9, 1);
// Scale (3 half floats and .w for quaternion .w) // Scale (3 half floats and .w for quaternion .w)