aProgramSrc->SetHeader ("#version 150");
}
#else
- if (myContext->IsGlGreaterEqual (3, 0))
+ if (myContext->IsGlGreaterEqual (3, 1))
{
+ // prefer "100 es" on OpenGL ES 3.0 devices
+ // and "300 es" on newer devices (3.1+)
aProgramSrc->SetHeader ("#version 300 es");
}
#endif
{
aProgramSrc->SetNbFragmentOutputs (2);
aProgramSrc->SetWeightOitOutput (true);
+ #if defined(GL_ES_VERSION_2_0)
+ if (myContext->IsGlGreaterEqual (3, 0))
+ {
+ aProgramSrc->SetHeader ("#version 300 es");
+ }
+ #endif
}
TCollection_AsciiString aSrcVertEndMain;
#if defined(GL_ES_VERSION_2_0)
if (myContext->IsGlGreaterEqual (3, 0))
{
+ aProgramSrc->SetHeader ("#version 300 es");
hasGlslBitOps = true;
}
#else
aProgramSrc->SetHeader ("#version 150");
}
#else
- if (myContext->IsGlGreaterEqual (3, 0))
+ if (myContext->IsGlGreaterEqual (3, 1))
{
+ // prefer "100 es" on OpenGL ES 3.0 devices
+ // and "300 es" on newer devices (3.1+)
aProgramSrc->SetHeader ("#version 300 es");
}
#endif
{
aProgramSrc->SetNbFragmentOutputs (2);
aProgramSrc->SetWeightOitOutput (true);
+ #if defined(GL_ES_VERSION_2_0)
+ if (myContext->IsGlGreaterEqual (3, 0))
+ {
+ aProgramSrc->SetHeader ("#version 300 es");
+ }
+ #endif
}
Standard_Integer aNbLights = 0;
aProgramSrc->SetHeader ("#version 150");
}
#else
- if (myContext->IsGlGreaterEqual (3, 0))
+ if (myContext->IsGlGreaterEqual (3, 1))
{
+ // prefer "100 es" on OpenGL ES 3.0 devices
+ // and "300 es" on newer devices (3.1+)
aProgramSrc->SetHeader ("#version 300 es");
}
#endif
aProgramSrc->SetHeader ("#version 150");
}
#else
- if (myContext->IsGlGreaterEqual (3, 0))
+ if (myContext->IsGlGreaterEqual (3, 1))
{
+ // prefer "100 es" on OpenGL ES 3.0 devices
+ // and "300 es" on newer devices (3.1+)
aProgramSrc->SetHeader ("#version 300 es");
}
else if (isFlatNormal)
{
- if (myContext->oesStdDerivatives)
+ if (myContext->IsGlGreaterEqual (3, 0))
+ {
+ aProgramSrc->SetHeader ("#version 300 es");
+ }
+ else if (myContext->oesStdDerivatives)
{
aProgramSrc->SetHeader ("#extension GL_OES_standard_derivatives : enable");
}
aProgramSrc->SetHeader ("#version 150");
}
#else
- if (myContext->IsGlGreaterEqual (3, 0))
+ if (myContext->IsGlGreaterEqual (3, 1))
{
+ // prefer "100 es" on OpenGL ES 3.0 devices
+ // and "300 es" on newer devices (3.1+)
aProgramSrc->SetHeader ("#version 300 es");
}
#endif