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

0031253: Visualization, TKOpenGl - phong shading GLSL compilation fail on Adreno 308

Browse Source 
Removed initialization of global Normal variable outside of main() block.
occLight_IsHeadlight() flag is now packed into occLight_Position().w
This commit is contained in:
kgv 2019-12-19 00:11:55 +03:00 committed by bugmaster
parent 9a1701fbcb
commit 9504a30d15
6 changed files with 80 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/OpenGl/OpenGl_ShaderManager.cxx
View File

@ -109,7 +109,7 @@ const char THE_FUNC_pointLight[] =
EOL" in vec3 thePoint," EOL" in vec3 thePoint,"
EOL" in bool theIsFront)" EOL" in bool theIsFront)"
EOL"{" EOL"{"
EOL" vec3 aLight = occLight_Position (theId).xyz;" EOL" vec3 aLight = occLight_Position (theId);"
EOL" if (!occLight_IsHeadlight (theId))" EOL" if (!occLight_IsHeadlight (theId))"
EOL" {" EOL" {"
EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));" EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));"
@ -119,8 +119,7 @@ const char THE_FUNC_pointLight[] =
EOL" float aDist = length (aLight);" EOL" float aDist = length (aLight);"
EOL" aLight = aLight * (1.0 / aDist);" EOL" aLight = aLight * (1.0 / aDist);"
EOL EOL
EOL" float anAtten = 1.0 / (occLight_ConstAttenuation (theId)" EOL" float anAtten = 1.0 / (occLight_ConstAttenuation (theId) + occLight_LinearAttenuation (theId) * aDist);"
EOL" + occLight_LinearAttenuation (theId) * aDist);"
EOL EOL
EOL" vec3 aHalf = normalize (aLight + theView);" EOL" vec3 aHalf = normalize (aLight + theView);"
EOL EOL
@ -134,8 +133,8 @@ const char THE_FUNC_pointLight[] =
EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());" EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());"
EOL" }" EOL" }"
EOL EOL
EOL" Diffuse += occLight_Diffuse (theId).rgb * aNdotL * anAtten;" EOL" Diffuse += occLight_Diffuse (theId) * aNdotL * anAtten;"
EOL" Specular += occLight_Specular (theId).rgb * aSpecl * anAtten;" EOL" Specular += occLight_Specular(theId) * aSpecl * anAtten;"
EOL"}"; EOL"}";
//! Function computes contribution of isotropic point light source //! Function computes contribution of isotropic point light source
@ -146,7 +145,7 @@ const char THE_FUNC_PBR_pointLight[] =
EOL" in vec3 thePoint," EOL" in vec3 thePoint,"
EOL" in bool theIsFront)" EOL" in bool theIsFront)"
EOL"{" EOL"{"
EOL" vec3 aLight = occLight_Position (theId).xyz;" EOL" vec3 aLight = occLight_Position (theId);"
EOL" if (occLight_IsHeadlight (theId))" EOL" if (occLight_IsHeadlight (theId))"
EOL" {" EOL" {"
EOL" aLight = vec3 (occWorldViewMatrixInverse * vec4 (aLight, 1.0));" EOL" aLight = vec3 (occWorldViewMatrixInverse * vec4 (aLight, 1.0));"
@ -159,14 +158,9 @@ const char THE_FUNC_PBR_pointLight[] =
EOL" float anAtten = 1.0 / max (aDist * aDist, 0.01);" EOL" float anAtten = 1.0 / max (aDist * aDist, 0.01);"
EOL EOL
EOL" theNormal = theIsFront ? theNormal : -theNormal;" EOL" theNormal = theIsFront ? theNormal : -theNormal;"
EOL" DirectLighting += occPBRIllumination (theView," EOL" DirectLighting += occPBRIllumination (theView, aLight, theNormal,"
EOL" aLight," EOL" BaseColor, Metallic, Roughness, IOR,"
EOL" theNormal," EOL" occLight_Specular (theId),"
EOL" BaseColor,"
EOL" Metallic,"
EOL" Roughness,"
EOL" IOR,"
EOL" occLight_Specular(theId).rgb,"
EOL" occLight_Intensity(theId) * anAtten);" EOL" occLight_Intensity(theId) * anAtten);"
EOL"}"; EOL"}";
@ -178,8 +172,8 @@ const char THE_FUNC_spotLight[] =
EOL" in vec3 thePoint," EOL" in vec3 thePoint,"
EOL" in bool theIsFront)" EOL" in bool theIsFront)"
EOL"{" EOL"{"
EOL" vec3 aLight = occLight_Position (theId).xyz;" EOL" vec3 aLight = occLight_Position (theId);"
EOL" vec3 aSpotDir = occLight_SpotDirection (theId).xyz;" EOL" vec3 aSpotDir = occLight_SpotDirection (theId);"
EOL" if (!occLight_IsHeadlight (theId))" EOL" if (!occLight_IsHeadlight (theId))"
EOL" {" EOL" {"
EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));" EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 1.0));"
@ -218,8 +212,8 @@ const char THE_FUNC_spotLight[] =
EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());" EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());"
EOL" }" EOL" }"
EOL EOL
EOL" Diffuse += occLight_Diffuse (theId).rgb * aNdotL * anAtten;" EOL" Diffuse += occLight_Diffuse (theId) * aNdotL * anAtten;"
EOL" Specular += occLight_Specular (theId).rgb * aSpecl * anAtten;" EOL" Specular += occLight_Specular(theId) * aSpecl * anAtten;"
EOL"}"; EOL"}";
//! Function computes contribution of spotlight source //! Function computes contribution of spotlight source
@ -230,8 +224,8 @@ const char THE_FUNC_spotLight[] =
EOL" in vec3 thePoint," EOL" in vec3 thePoint,"
EOL" in bool theIsFront)" EOL" in bool theIsFront)"
EOL"{" EOL"{"
EOL" vec3 aLight = occLight_Position (theId).xyz;" EOL" vec3 aLight = occLight_Position (theId);"
EOL" vec3 aSpotDir = occLight_SpotDirection (theId).xyz;" EOL" vec3 aSpotDir = occLight_SpotDirection (theId);"
EOL" if (occLight_IsHeadlight (theId))" EOL" if (occLight_IsHeadlight (theId))"
EOL" {" EOL" {"
EOL" aLight = vec3 (occWorldViewMatrixInverse * vec4 (aLight, 1.0));" EOL" aLight = vec3 (occWorldViewMatrixInverse * vec4 (aLight, 1.0));"
@ -258,14 +252,9 @@ const char THE_FUNC_spotLight[] =
EOL" }" EOL" }"
EOL EOL
EOL" theNormal = theIsFront ? theNormal : -theNormal;" EOL" theNormal = theIsFront ? theNormal : -theNormal;"
EOL" DirectLighting += occPBRIllumination (theView," EOL" DirectLighting += occPBRIllumination (theView aLight, theNormal,"
EOL" aLight," EOL" BaseColor, Metallic, Roughness, IOR,"
EOL" theNormal," EOL" occLight_Specular(theId),"
EOL" BaseColor,"
EOL" Metallic,"
EOL" Roughness,"
EOL" IOR,"
EOL" occLight_Specular(theId).rgb,"
EOL" occLight_Intensity(theId) * anAtten);" EOL" occLight_Intensity(theId) * anAtten);"
EOL"}"; EOL"}";
@ -276,7 +265,7 @@ const char THE_FUNC_directionalLight[] =
EOL" in vec3 theView," EOL" in vec3 theView,"
EOL" in bool theIsFront)" EOL" in bool theIsFront)"
EOL"{" EOL"{"
EOL" vec3 aLight = normalize (occLight_Position (theId).xyz);" EOL" vec3 aLight = normalize (occLight_Position (theId));"
EOL" if (!occLight_IsHeadlight (theId))" EOL" if (!occLight_IsHeadlight (theId))"
EOL" {" EOL" {"
EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 0.0));" EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 0.0));"
@ -294,8 +283,8 @@ const char THE_FUNC_directionalLight[] =
EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());" EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());"
EOL" }" EOL" }"
EOL EOL
EOL" Diffuse += occLight_Diffuse (theId).rgb * aNdotL;" EOL" Diffuse += occLight_Diffuse (theId) * aNdotL;"
EOL" Specular += occLight_Specular (theId).rgb * aSpecl;" EOL" Specular += occLight_Specular (theId) * aSpecl;"
EOL"}"; EOL"}";
//! Function computes contribution of directional light source //! Function computes contribution of directional light source
@ -305,21 +294,16 @@ const char THE_FUNC_PBR_directionalLight[] =
EOL" in vec3 theView," EOL" in vec3 theView,"
EOL" in bool theIsFront)" EOL" in bool theIsFront)"
EOL"{" EOL"{"
EOL" vec3 aLight = normalize (occLight_Position (theId).xyz);" EOL" vec3 aLight = normalize (occLight_Position (theId));"
EOL" if (occLight_IsHeadlight (theId))" EOL" if (occLight_IsHeadlight (theId))"
EOL" {" EOL" {"
EOL" aLight = vec3 (occWorldViewMatrixInverse * vec4 (aLight, 0.0));" EOL" aLight = vec3 (occWorldViewMatrixInverse * vec4 (aLight, 0.0));"
EOL" }" EOL" }"
EOL EOL
EOL" theNormal = theIsFront ? theNormal : -theNormal;" EOL" theNormal = theIsFront ? theNormal : -theNormal;"
EOL" DirectLighting += occPBRIllumination (theView," EOL" DirectLighting += occPBRIllumination (theView, aLight, theNormal,"
EOL" aLight," EOL" BaseColor, Metallic, Roughness, IOR,"
EOL" theNormal," EOL" occLight_Specular (theId),"
EOL" BaseColor,"
EOL" Metallic,"
EOL" Roughness,"
EOL" IOR,"
EOL" occLight_Specular(theId).rgb,"
EOL" occLight_Intensity(theId));" EOL" occLight_Intensity(theId));"
EOL"}"; EOL"}";
@ -330,7 +314,7 @@ const char THE_FUNC_directionalLightFirst[] =
EOL" in vec3 theView," EOL" in vec3 theView,"
EOL" in bool theIsFront)" EOL" in bool theIsFront)"
EOL"{" EOL"{"
EOL" vec3 aLight = normalize (occLightSources[1].xyz);" EOL" vec3 aLight = normalize (occLight_Position(0));"
EOL" if (!occLight_IsHeadlight (0))" EOL" if (!occLight_IsHeadlight (0))"
EOL" {" EOL" {"
EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 0.0));" EOL" aLight = vec3 (occWorldViewMatrix * vec4 (aLight, 0.0));"
@ -348,8 +332,8 @@ const char THE_FUNC_directionalLightFirst[] =
EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());" EOL" aSpecl = pow (aNdotH, theIsFront ? occFrontMaterial_Shininess() : occBackMaterial_Shininess());"
EOL" }" EOL" }"
EOL EOL
EOL" Diffuse += occLightSources[0].rgb * aNdotL;" EOL" Diffuse += occLight_Diffuse(0) * aNdotL;"
EOL" Specular += occLightSources[0].rgb * aSpecl;" EOL" Specular += occLight_Specular(0) * aSpecl;"
EOL"}"; EOL"}";
//! Returns the real cubemap fetching direction considering sides orientation, memory layout and vertical flip. //! Returns the real cubemap fetching direction considering sides orientation, memory layout and vertical flip.
@ -500,7 +484,7 @@ EOL" gl_Position = occProjectionMatrix * occWorldViewMatrix * occModelWorldMatr
theCtx->core11->glLightf (theLightGlId, GL_SPOT_CUTOFF, THE_DEFAULT_SPOT_CUTOFF); theCtx->core11->glLightf (theLightGlId, GL_SPOT_CUTOFF, THE_DEFAULT_SPOT_CUTOFF);
theCtx->core11->glLightf (theLightGlId, GL_CONSTANT_ATTENUATION, theLight.ConstAttenuation()); theCtx->core11->glLightf (theLightGlId, GL_CONSTANT_ATTENUATION, theLight.ConstAttenuation());
theCtx->core11->glLightf (theLightGlId, GL_LINEAR_ATTENUATION, theLight.LinearAttenuation()); theCtx->core11->glLightf (theLightGlId, GL_LINEAR_ATTENUATION, theLight.LinearAttenuation());
theCtx->core11->glLightf (theLightGlId, GL_QUADRATIC_ATTENUATION, 0.0); theCtx->core11->glLightf (theLightGlId, GL_QUADRATIC_ATTENUATION, 0.0f);
break; break;
} }
case Graphic3d_TOLS_SPOT: case Graphic3d_TOLS_SPOT:
@ -867,7 +851,7 @@ void OpenGl_ShaderManager::pushLightSourceState (const Handle(OpenGl_ShaderProgr
} }
for (Standard_Integer aLightIt = 0; aLightIt < aNbLightsMax; ++aLightIt) for (Standard_Integer aLightIt = 0; aLightIt < aNbLightsMax; ++aLightIt)
{ {
myLightTypeArray.ChangeValue (aLightIt).Type = -1; myLightTypeArray.SetValue (aLightIt, -1);
} }
if (myLightSourceState.LightSources().IsNull() if (myLightSourceState.LightSources().IsNull()
@ -881,8 +865,8 @@ void OpenGl_ShaderManager::pushLightSourceState (const Handle(OpenGl_ShaderProgr
OpenGl_Vec4 (0.0f, 0.0f, 0.0f, 0.0f)); OpenGl_Vec4 (0.0f, 0.0f, 0.0f, 0.0f));
theProgram->SetUniform (myContext, theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_TYPES), theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_TYPES),
aNbLightsMax * OpenGl_ShaderLightType::NbOfVec2i(), aNbLightsMax,
myLightTypeArray.First().Packed()); &myLightTypeArray.First());
return; return;
} }
@ -901,22 +885,20 @@ void OpenGl_ShaderManager::pushLightSourceState (const Handle(OpenGl_ShaderProgr
continue; continue;
} }
OpenGl_ShaderLightType& aLightType = myLightTypeArray.ChangeValue (aLightsNb); Standard_Integer& aLightType = myLightTypeArray .ChangeValue (aLightsNb);
OpenGl_ShaderLightParameters& aLightParams = myLightParamsArray.ChangeValue (aLightsNb); OpenGl_ShaderLightParameters& aLightParams = myLightParamsArray.ChangeValue (aLightsNb);
if (!aLight.IsEnabled()) // has no affect with Graphic3d_LightSet::IterationFilter_ExcludeDisabled - here just for consistency if (!aLight.IsEnabled()) // has no affect with Graphic3d_LightSet::IterationFilter_ExcludeDisabled - here just for consistency
{ {
// if it is desired to keep disabled light in the same order - we can replace it with a black light so that it will have no influence on result // if it is desired to keep disabled light in the same order - we can replace it with a black light so that it will have no influence on result
aLightType.Type = -1; // Graphic3d_TOLS_AMBIENT can be used instead aLightType = -1; // Graphic3d_TOLS_AMBIENT can be used instead
aLightType.IsHeadlight = false; aLightParams.Color = OpenGl_Vec4 (0.0f, 0.0f, 0.0f, 0.0f);
aLightParams.Color = OpenGl_Vec4 (0.0f, 0.0f, 0.0f, 0.0f);
++aLightsNb; ++aLightsNb;
continue; continue;
} }
// ignoring OpenGl_Context::ToRenderSRGB() for light colors, // ignoring OpenGl_Context::ToRenderSRGB() for light colors,
// as non-absolute colors for lights are rare and require tuning anyway // as non-absolute colors for lights are rare and require tuning anyway
aLightType.Type = aLight.Type(); aLightType = aLight.Type();
aLightType.IsHeadlight = aLight.IsHeadlight();
aLightParams.Color = aLight.PackedColor(); aLightParams.Color = aLight.PackedColor();
aLightParams.Color.a() = aLight.Intensity(); // used by PBR and ignored by old shading model aLightParams.Color.a() = aLight.Intensity(); // used by PBR and ignored by old shading model
if (aLight.Type() == Graphic3d_TOLS_DIRECTIONAL) if (aLight.Type() == Graphic3d_TOLS_DIRECTIONAL)
@ -928,15 +910,14 @@ void OpenGl_ShaderManager::pushLightSourceState (const Handle(OpenGl_ShaderProgr
aLightParams.Position.x() = static_cast<float>(aLight.Position().X() - myLocalOrigin.X()); aLightParams.Position.x() = static_cast<float>(aLight.Position().X() - myLocalOrigin.X());
aLightParams.Position.y() = static_cast<float>(aLight.Position().Y() - myLocalOrigin.Y()); aLightParams.Position.y() = static_cast<float>(aLight.Position().Y() - myLocalOrigin.Y());
aLightParams.Position.z() = static_cast<float>(aLight.Position().Z() - myLocalOrigin.Z()); aLightParams.Position.z() = static_cast<float>(aLight.Position().Z() - myLocalOrigin.Z());
aLightParams.Position.w() = 1.0f;
} }
else else
{ {
aLightParams.Position.x() = static_cast<float>(aLight.Position().X()); aLightParams.Position.x() = static_cast<float>(aLight.Position().X());
aLightParams.Position.y() = static_cast<float>(aLight.Position().Y()); aLightParams.Position.y() = static_cast<float>(aLight.Position().Y());
aLightParams.Position.z() = static_cast<float>(aLight.Position().Z()); aLightParams.Position.z() = static_cast<float>(aLight.Position().Z());
aLightParams.Position.w() = 1.0f;
} }
aLightParams.Position.w() = aLight.IsHeadlight() ? 1.0f : 0.0f;
if (aLight.Type() == Graphic3d_TOLS_SPOT) if (aLight.Type() == Graphic3d_TOLS_SPOT)
{ {
@ -955,8 +936,8 @@ void OpenGl_ShaderManager::pushLightSourceState (const Handle(OpenGl_ShaderProgr
anAmbient); anAmbient);
theProgram->SetUniform (myContext, theProgram->SetUniform (myContext,
theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_TYPES), theProgram->GetStateLocation (OpenGl_OCC_LIGHT_SOURCE_TYPES),
aNbLightsMax * OpenGl_ShaderLightType::NbOfVec2i(), aNbLightsMax,
myLightTypeArray.First().Packed()); &myLightTypeArray.First());
if (aLightsNb > 0) if (aLightsNb > 0)
{ {
theProgram->SetUniform (myContext, theProgram->SetUniform (myContext,
@ -2593,7 +2574,7 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramPhong (Handle(OpenGl_Sha
aProgramSrc->SetPBR (theIsPBR); aProgramSrc->SetPBR (theIsPBR);
TCollection_AsciiString aSrcVert, aSrcVertExtraFunc, aSrcVertExtraMain; TCollection_AsciiString aSrcVert, aSrcVertExtraFunc, aSrcVertExtraMain;
TCollection_AsciiString aSrcFrag, aSrcFragExtraFunc, aSrcFragExtraOut, aSrcFragGetVertColor, aSrcFragExtraMain; TCollection_AsciiString aSrcFrag, aSrcFragGetVertColor, aSrcFragExtraMain;
TCollection_AsciiString aSrcFragGetColor = TCollection_AsciiString() + EOL"vec4 getColor(void) { return " + aPhongCompLight + "; }"; TCollection_AsciiString aSrcFragGetColor = TCollection_AsciiString() + EOL"vec4 getColor(void) { return " + aPhongCompLight + "; }";
OpenGl_ShaderObject::ShaderVariableList aUniforms, aStageInOuts; OpenGl_ShaderObject::ShaderVariableList aUniforms, aStageInOuts;
if ((theBits & OpenGl_PO_IsPoint) != 0) if ((theBits & OpenGl_PO_IsPoint) != 0)
@ -2708,7 +2689,6 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramPhong (Handle(OpenGl_Sha
if (isFlatNormal) if (isFlatNormal)
{ {
aSrcFragExtraOut += EOL"vec3 Normal;";
aSrcFragExtraMain += TCollection_AsciiString() aSrcFragExtraMain += TCollection_AsciiString()
+ EOL" Normal = " + aDFdxSignReversion + "normalize (cross (dFdx (" + aPosition + ".xyz / " + aPosition + ".w), dFdy (" + aPosition + ".xyz / " + aPosition + ".w)));" + EOL" Normal = " + aDFdxSignReversion + "normalize (cross (dFdx (" + aPosition + ".xyz / " + aPosition + ".w), dFdy (" + aPosition + ".xyz / " + aPosition + ".w)));"
EOL" if (!gl_FrontFacing) { Normal = -Normal; }"; EOL" if (!gl_FrontFacing) { Normal = -Normal; }";
@ -2718,7 +2698,7 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramPhong (Handle(OpenGl_Sha
aStageInOuts.Append(OpenGl_ShaderObject::ShaderVariable("vec3 vNormal", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT)); aStageInOuts.Append(OpenGl_ShaderObject::ShaderVariable("vec3 vNormal", Graphic3d_TOS_VERTEX | Graphic3d_TOS_FRAGMENT));
aSrcVertExtraFunc += THE_FUNC_transformNormal_world; aSrcVertExtraFunc += THE_FUNC_transformNormal_world;
aSrcVertExtraMain += EOL" vNormal = transformNormal (occNormal);"; aSrcVertExtraMain += EOL" vNormal = transformNormal (occNormal);";
aSrcFragExtraFunc += EOL" vec3 Normal = vNormal;"; aSrcFragExtraMain += EOL" Normal = vNormal;";
if ((theBits & OpenGl_PO_IsPoint) == 0 if ((theBits & OpenGl_PO_IsPoint) == 0
&& (theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureNormal && (theBits & OpenGl_PO_HasTextures) == OpenGl_PO_TextureNormal
@ -2782,9 +2762,8 @@ Standard_Boolean OpenGl_ShaderManager::prepareStdProgramPhong (Handle(OpenGl_Sha
|| (theBits & OpenGl_PO_IsPoint) != 0); || (theBits & OpenGl_PO_IsPoint) != 0);
aSrcFrag = TCollection_AsciiString() aSrcFrag = TCollection_AsciiString()
+ EOL + EOL
+ aSrcFragExtraFunc
+ aSrcFragExtraOut
+ aSrcFragGetVertColor + aSrcFragGetVertColor
+ EOL"vec3 Normal;"
+ aLights + aLights
+ aSrcFragGetColor + aSrcFragGetColor
+ EOL + EOL

21
src/OpenGl/OpenGl_ShaderManager.hxx
View File

@ -760,27 +760,16 @@ protected:
//! Packed properties of light source //! Packed properties of light source
struct OpenGl_ShaderLightParameters struct OpenGl_ShaderLightParameters
{ {
OpenGl_Vec4 Color; OpenGl_Vec4 Color; //!< RGB color + Intensity (in .w)
OpenGl_Vec4 Position; OpenGl_Vec4 Position; //!< XYZ Direction or Position + IsHeadlight (in .w)
OpenGl_Vec4 Direction; OpenGl_Vec4 Direction; //!< spot light XYZ direction
OpenGl_Vec4 Parameters; OpenGl_Vec4 Parameters; //!< same as Graphic3d_CLight::PackedParams()
//! Returns packed (serialized) representation of light source properties //! Returns packed (serialized) representation of light source properties
const OpenGl_Vec4* Packed() const { return reinterpret_cast<const OpenGl_Vec4*> (this); } const OpenGl_Vec4* Packed() const { return reinterpret_cast<const OpenGl_Vec4*> (this); }
static Standard_Integer NbOfVec4() { return 4; } static Standard_Integer NbOfVec4() { return 4; }
}; };
//! Packed light source type information
struct OpenGl_ShaderLightType
{
Standard_Integer Type;
Standard_Integer IsHeadlight;
//! Returns packed (serialized) representation of light source type
const OpenGl_Vec2i* Packed() const { return reinterpret_cast<const OpenGl_Vec2i*> (this); }
static Standard_Integer NbOfVec2i() { return 1; }
};
//! Fake OpenGL program for tracking FFP state in the way consistent to programmable pipeline. //! Fake OpenGL program for tracking FFP state in the way consistent to programmable pipeline.
class OpenGl_ShaderProgramFFP : public OpenGl_ShaderProgram class OpenGl_ShaderProgramFFP : public OpenGl_ShaderProgram
{ {
@ -852,7 +841,7 @@ protected:
gp_XYZ myLocalOrigin; //!< local camera transformation gp_XYZ myLocalOrigin; //!< local camera transformation
Standard_Boolean myHasLocalOrigin; //!< flag indicating that local camera transformation has been set Standard_Boolean myHasLocalOrigin; //!< flag indicating that local camera transformation has been set
mutable NCollection_Array1<OpenGl_ShaderLightType> myLightTypeArray; mutable NCollection_Array1<Standard_Integer> myLightTypeArray;
mutable NCollection_Array1<OpenGl_ShaderLightParameters> myLightParamsArray; mutable NCollection_Array1<OpenGl_ShaderLightParameters> myLightParamsArray;
mutable NCollection_Array1<OpenGl_Vec4> myClipPlaneArray; mutable NCollection_Array1<OpenGl_Vec4> myClipPlaneArray;
mutable NCollection_Array1<OpenGl_Vec4d> myClipPlaneArrayFfp; mutable NCollection_Array1<OpenGl_Vec4d> myClipPlaneArrayFfp;

31
src/Shaders/Declarations.glsl
View File

@ -139,19 +139,22 @@ uniform vec4 occLightAmbient; //!< Cumulative ambient color
uniform THE_PREC_ENUM int occLightSourcesCount; //!< Total number of light sources uniform THE_PREC_ENUM int occLightSourcesCount; //!< Total number of light sources
//! Type of light source, int (see OccLightType enum). //! Type of light source, int (see OccLightType enum).
#define occLight_Type(theId) occLightSourcesTypes[theId].x #define occLight_Type(theId) occLightSourcesTypes[theId]
//! Is light a headlight, int? //! Specular intensity (equals to diffuse), vec3.
#define occLight_IsHeadlight(theId) (occLightSourcesTypes[theId].y != 0) #define occLight_Specular(theId) occLightSources[theId * 4 + 0].rgb
//! Specular intensity (equals to diffuse), vec4. //! Intensity of light source (>= 0), float.
#define occLight_Specular(theId) occLightSources[theId * 4 + 0] #define occLight_Intensity(theId) occLightSources[theId * 4 + 0].a
//! Position of specified light source, vec4. //! Is light a headlight, bool?
#define occLight_Position(theId) occLightSources[theId * 4 + 1] #define occLight_IsHeadlight(theId) (occLightSources[theId * 4 + 1].w > 0.5)
//! Direction of specified spot light source, vec4. //! Position of specified light source, vec3.
#define occLight_SpotDirection(theId) occLightSources[theId * 4 + 2] #define occLight_Position(theId) occLightSources[theId * 4 + 1].xyz
//! Direction of specified spot light source, vec3.
#define occLight_SpotDirection(theId) occLightSources[theId * 4 + 2].xyz
//! Maximum spread angle of the spot light (in radians), float. //! Maximum spread angle of the spot light (in radians), float.
#define occLight_SpotCutOff(theId) occLightSources[theId * 4 + 3].z #define occLight_SpotCutOff(theId) occLightSources[theId * 4 + 3].z
@ -159,13 +162,9 @@ uniform THE_PREC_ENUM int occLightSourcesCount; //!< Total number of light sour
//! Attenuation of the spot light intensity (from 0 to 1), float. //! Attenuation of the spot light intensity (from 0 to 1), float.
#define occLight_SpotExponent(theId) occLightSources[theId * 4 + 3].w #define occLight_SpotExponent(theId) occLightSources[theId * 4 + 3].w
#if defined(THE_IS_PBR) #if !defined(THE_IS_PBR)
//! Intensity of light source (>= 0), float. //! Diffuse intensity (equals to Specular), vec3.
#define occLight_Intensity(theId) occLightSources[theId * 4 + 0].a #define occLight_Diffuse(theId) occLightSources[theId * 4 + 0].rgb
#else
//! Diffuse intensity (equals to Specular), vec4.
#define occLight_Diffuse(theId) occLightSources[theId * 4 + 0]
//! Const attenuation factor of positional light source, float. //! Const attenuation factor of positional light source, float.
#define occLight_ConstAttenuation(theId) occLightSources[theId * 4 + 3].x #define occLight_ConstAttenuation(theId) occLightSources[theId * 4 + 3].x

4
src/Shaders/DeclarationsImpl.glsl
View File

@ -19,8 +19,8 @@ void occSetFragColor (in vec4 theColor)
#if defined(THE_MAX_LIGHTS) && (THE_MAX_LIGHTS > 0) #if defined(THE_MAX_LIGHTS) && (THE_MAX_LIGHTS > 0)
// arrays of light sources // arrays of light sources
uniform vec4 occLightSources[THE_MAX_LIGHTS * 4]; //!< packed light sources parameters uniform vec4 occLightSources[THE_MAX_LIGHTS * 4]; //!< packed light sources parameters
uniform THE_PREC_ENUM ivec2 occLightSourcesTypes[THE_MAX_LIGHTS]; //!< packed light sources types uniform THE_PREC_ENUM int occLightSourcesTypes[THE_MAX_LIGHTS]; //!< packed light sources types
#endif #endif
#if defined(THE_IS_PBR) #if defined(THE_IS_PBR)

4
src/Shaders/Shaders_DeclarationsImpl_glsl.pxx
View File

@ -22,8 +22,8 @@ static const char Shaders_DeclarationsImpl_glsl[] =
"\n" "\n"
"#if defined(THE_MAX_LIGHTS) && (THE_MAX_LIGHTS > 0)\n" "#if defined(THE_MAX_LIGHTS) && (THE_MAX_LIGHTS > 0)\n"
"// arrays of light sources\n" "// arrays of light sources\n"
"uniform vec4 occLightSources[THE_MAX_LIGHTS * 4]; //!< packed light sources parameters\n" "uniform vec4 occLightSources[THE_MAX_LIGHTS * 4]; //!< packed light sources parameters\n"
"uniform THE_PREC_ENUM ivec2 occLightSourcesTypes[THE_MAX_LIGHTS]; //!< packed light sources types\n" "uniform THE_PREC_ENUM int occLightSourcesTypes[THE_MAX_LIGHTS]; //!< packed light sources types\n"
"#endif\n" "#endif\n"
"\n" "\n"
"#if defined(THE_IS_PBR)\n" "#if defined(THE_IS_PBR)\n"

31
src/Shaders/Shaders_Declarations_glsl.pxx
View File

@ -142,19 +142,22 @@ static const char Shaders_Declarations_glsl[] =
"uniform THE_PREC_ENUM int occLightSourcesCount; //!< Total number of light sources\n" "uniform THE_PREC_ENUM int occLightSourcesCount; //!< Total number of light sources\n"
"\n" "\n"
"//! Type of light source, int (see OccLightType enum).\n" "//! Type of light source, int (see OccLightType enum).\n"
"#define occLight_Type(theId) occLightSourcesTypes[theId].x\n" "#define occLight_Type(theId) occLightSourcesTypes[theId]\n"
"\n" "\n"
"//! Is light a headlight, int?\n" "//! Specular intensity (equals to diffuse), vec3.\n"
"#define occLight_IsHeadlight(theId) (occLightSourcesTypes[theId].y != 0)\n" "#define occLight_Specular(theId) occLightSources[theId * 4 + 0].rgb\n"
"\n" "\n"
"//! Specular intensity (equals to diffuse), vec4.\n" "//! Intensity of light source (>= 0), float.\n"
"#define occLight_Specular(theId) occLightSources[theId * 4 + 0]\n" "#define occLight_Intensity(theId) occLightSources[theId * 4 + 0].a\n"
"\n" "\n"
"//! Position of specified light source, vec4.\n" "//! Is light a headlight, bool?\n"
"#define occLight_Position(theId) occLightSources[theId * 4 + 1]\n" "#define occLight_IsHeadlight(theId) (occLightSources[theId * 4 + 1].w > 0.5)\n"
"\n" "\n"
"//! Direction of specified spot light source, vec4.\n" "//! Position of specified light source, vec3.\n"
"#define occLight_SpotDirection(theId) occLightSources[theId * 4 + 2]\n" "#define occLight_Position(theId) occLightSources[theId * 4 + 1].xyz\n"
"\n"
"//! Direction of specified spot light source, vec3.\n"
"#define occLight_SpotDirection(theId) occLightSources[theId * 4 + 2].xyz\n"
"\n" "\n"
"//! Maximum spread angle of the spot light (in radians), float.\n" "//! Maximum spread angle of the spot light (in radians), float.\n"
"#define occLight_SpotCutOff(theId) occLightSources[theId * 4 + 3].z\n" "#define occLight_SpotCutOff(theId) occLightSources[theId * 4 + 3].z\n"
@ -162,13 +165,9 @@ static const char Shaders_Declarations_glsl[] =
"//! Attenuation of the spot light intensity (from 0 to 1), float.\n" "//! Attenuation of the spot light intensity (from 0 to 1), float.\n"
"#define occLight_SpotExponent(theId) occLightSources[theId * 4 + 3].w\n" "#define occLight_SpotExponent(theId) occLightSources[theId * 4 + 3].w\n"
"\n" "\n"
"#if defined(THE_IS_PBR)\n" "#if !defined(THE_IS_PBR)\n"
"//! Intensity of light source (>= 0), float.\n" "//! Diffuse intensity (equals to Specular), vec3.\n"
"#define occLight_Intensity(theId) occLightSources[theId * 4 + 0].a\n" "#define occLight_Diffuse(theId) occLightSources[theId * 4 + 0].rgb\n"
"#else\n"
"\n"
"//! Diffuse intensity (equals to Specular), vec4.\n"
"#define occLight_Diffuse(theId) occLightSources[theId * 4 + 0]\n"
"\n" "\n"
"//! Const attenuation factor of positional light source, float.\n" "//! Const attenuation factor of positional light source, float.\n"
"#define occLight_ConstAttenuation(theId) occLightSources[theId * 4 + 3].x\n" "#define occLight_ConstAttenuation(theId) occLightSources[theId * 4 + 3].x\n"