OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0024345: TKOpenGl - GLSL compatibility issues on NV40 (GeForce 6xxx/7xxx)

Browse Source 
Iterate through maximum light sources in Fragment shader instead of active lights
This commit is contained in:
kgv 2013-11-13 22:01:45 +04:00 committed by bugmaster
parent 64c759f898
commit 01eaf6549b
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/OpenGl/OpenGl_ShaderManager.cxx
View File

@ -261,7 +261,7 @@ public:
//! Returns packed (serialized) representation of light source properties //! Returns packed (serialized) representation of light source properties
const OpenGl_Vec4* Packed() { return reinterpret_cast<OpenGl_Vec4*> (this); } const OpenGl_Vec4* Packed() { return reinterpret_cast<OpenGl_Vec4*> (this); }
static Standard_Size NbOfVec4() { return 4; } static Standard_Integer NbOfVec4() { return 4; }
}; };
@ -275,7 +275,7 @@ public:
//! Returns packed (serialized) representation of light source type //! Returns packed (serialized) representation of light source type
const OpenGl_Vec2i* Packed() { return reinterpret_cast<OpenGl_Vec2i*> (this); } const OpenGl_Vec2i* Packed() { return reinterpret_cast<OpenGl_Vec2i*> (this); }
static Standard_Size NbOfVec2i() { return 1; } static Standard_Integer NbOfVec2i() { return 1; }
}; };
@ -291,6 +291,12 @@ void OpenGl_ShaderManager::PushLightSourceState (const Handle(OpenGl_ShaderProgr
return; return;
} }
OpenGl_ShaderLightType* aLightTypeArray = new OpenGl_ShaderLightType[OpenGLMaxLights];
for (Standard_Integer aLightIt = 0; aLightIt < OpenGLMaxLights; ++aLightIt)
{
aLightTypeArray[aLightIt].Type = -1;
}
const Standard_Integer aLightsDefNb = Min (myLightSourceState.LightSources()->Size(), OpenGLMaxLights); const Standard_Integer aLightsDefNb = Min (myLightSourceState.LightSources()->Size(), OpenGLMaxLights);
if (aLightsDefNb < 1) if (aLightsDefNb < 1)
{ {
@ -300,12 +306,15 @@ void OpenGl_ShaderManager::PushLightSourceState (const Handle(OpenGl_ShaderProgr
theProgram->SetUniform (myContext, theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_AMBIENT), theProgram->GetStateLocation (OpenGl_OCC_LIGHT_AMBIENT),
OpenGl_Vec4 (0.0f, 0.0f, 0.0f, 0.0f)); OpenGl_Vec4 (0.0f, 0.0f, 0.0f, 0.0f));
theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_TYPES),
OpenGLMaxLights * OpenGl_ShaderLightType::NbOfVec2i(),
aLightTypeArray[0].Packed());
theProgram->UpdateState (OpenGl_LIGHT_SOURCES_STATE, myLightSourceState.Index()); theProgram->UpdateState (OpenGl_LIGHT_SOURCES_STATE, myLightSourceState.Index());
return; return;
} }
OpenGl_ShaderLightParameters* aLightParamsArray = new OpenGl_ShaderLightParameters[aLightsDefNb]; OpenGl_ShaderLightParameters* aLightParamsArray = new OpenGl_ShaderLightParameters[aLightsDefNb];
OpenGl_ShaderLightType* aLightTypeArray = new OpenGl_ShaderLightType[aLightsDefNb];
OpenGl_Vec4 anAmbient (0.0f, 0.0f, 0.0f, 0.0f); OpenGl_Vec4 anAmbient (0.0f, 0.0f, 0.0f, 0.0f);
Standard_Integer aLightsNb = 0; Standard_Integer aLightsNb = 0;
@ -345,12 +354,12 @@ void OpenGl_ShaderManager::PushLightSourceState (const Handle(OpenGl_ShaderProgr
theProgram->SetUniform (myContext, theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_AMBIENT), theProgram->GetStateLocation (OpenGl_OCC_LIGHT_AMBIENT),
anAmbient); anAmbient);
theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_TYPES),
OpenGLMaxLights * OpenGl_ShaderLightType::NbOfVec2i(),
aLightTypeArray[0].Packed());
if (aLightsNb > 0) if (aLightsNb > 0)
{ {
theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_TYPES),
aLightsNb * OpenGl_ShaderLightType::NbOfVec2i(),
aLightTypeArray[0].Packed());
theProgram->SetUniform (myContext, theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_PARAMS), theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_PARAMS),
aLightsNb * OpenGl_ShaderLightParameters::NbOfVec4(), aLightsNb * OpenGl_ShaderLightParameters::NbOfVec4(),

2
src/Shaders/PhongShading.fs
View File

@ -97,7 +97,7 @@ vec4 computeLighting (in vec3 theNormal,
Diffuse = vec3 (0.0); Diffuse = vec3 (0.0);
Specular = vec3 (0.0); Specular = vec3 (0.0);
vec3 aPoint = thePoint.xyz / thePoint.w; vec3 aPoint = thePoint.xyz / thePoint.w;
for (int anIndex = 0; anIndex < occLightSourcesCount; ++anIndex) for (int anIndex = 0; anIndex < THE_MAX_LIGHTS; ++anIndex)
{ {
int aType = occLight_Type (anIndex); int aType = occLight_Type (anIndex);
if (aType == OccLightType_Direct) if (aType == OccLightType_Direct)