zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable IBL on software opengl (Mesa)

master
huxingyi 2020-03-19 17:24:30 +09:30
parent b28c911b3e
commit 3a14b05977
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modelmeshbinder.cpp
View File

@ -63,6 +63,18 @@ void ModelMeshBinder::enableEnvironmentLight()
void ModelMeshBinder::paint(ModelShaderProgram *program) void ModelMeshBinder::paint(ModelShaderProgram *program)
{ {
static int s_softwareGlState = 0;
if (0 == s_softwareGlState) {
QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
const char *versionString = (const char *)f->glGetString(GL_VERSION);
if (nullptr != versionString &&
'\0' != versionString[0] &&
0 == strstr(versionString, "Mesa")) {
s_softwareGlState = 2;
} else {
s_softwareGlState = 1;
}
}
MeshLoader *newMesh = nullptr; MeshLoader *newMesh = nullptr;
bool hasNewMesh = false; bool hasNewMesh = false;
if (m_newMeshComing) { if (m_newMeshComing) {
@ -113,7 +125,9 @@ void ModelMeshBinder::paint(ModelShaderProgram *program)
m_environmentIrradianceMap = nullptr; m_environmentIrradianceMap = nullptr;
delete m_environmentSpecularMap; delete m_environmentSpecularMap;
m_environmentSpecularMap = nullptr; m_environmentSpecularMap = nullptr;
if (program->isCoreProfile() && m_environmentLightEnabled && if (program->isCoreProfile() &&
m_environmentLightEnabled &&
2 == s_softwareGlState &&
(m_hasMetalnessMap || m_hasRoughnessMap)) { (m_hasMetalnessMap || m_hasRoughnessMap)) {
DdsFileReader irradianceFile(":/resources/cedar_bridge_irradiance.dds"); DdsFileReader irradianceFile(":/resources/cedar_bridge_irradiance.dds");
m_environmentIrradianceMap = irradianceFile.createOpenGLTexture(); m_environmentIrradianceMap = irradianceFile.createOpenGLTexture();
@ -222,17 +236,6 @@ void ModelMeshBinder::paint(ModelShaderProgram *program)
QOpenGLVertexArrayObject::Binder vaoBinder(&m_vaoEdge); QOpenGLVertexArrayObject::Binder vaoBinder(&m_vaoEdge);
QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions(); QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
// glDrawArrays GL_LINES crashs on Mesa GL // glDrawArrays GL_LINES crashs on Mesa GL
static int s_softwareGlState = 0;
if (0 == s_softwareGlState) {
const char *versionString = (const char *)f->glGetString(GL_VERSION);
if (nullptr != versionString &&
'\0' != versionString[0] &&
0 == strstr(versionString, "Mesa")) {
s_softwareGlState = 2;
} else {
s_softwareGlState = 1;
}
}
if (2 == s_softwareGlState) { if (2 == s_softwareGlState) {
program->setUniformValue(program->textureEnabledLoc(), 0); program->setUniformValue(program->textureEnabledLoc(), 0);
program->setUniformValue(program->normalMapEnabledLoc(), 0); program->setUniformValue(program->normalMapEnabledLoc(), 0);