olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lightpreview: show dialog box for glsl compile errors

This commit is contained in:
Eric Wasylishen 2024-05-26 21:27:23 -06:00
parent f1d992ed74
commit 38b663f187
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lightpreview/glview.cpp
View File

@ -34,6 +34,7 @@ See file, 'COPYING', for details.
#include <QOpenGLDebugLogger>
#include <QStandardPaths>
#include <QDateTime>
#include <QMessageBox>
#include <common/decompile.hh>
#include <common/bspfile.hh>
@ -515,6 +516,28 @@ void GLView::handleLoggedMessage(const QOpenGLDebugMessage &debugMessage)
#endif
}
void GLView::error(const QString &context, const QString &context2, const QString &log)
{
QMessageBox errorMessage(
QMessageBox::Critical,
tr("GLSL Error"), tr("%1: %2:\n\n%3").arg(context).arg(context2).arg(log), QMessageBox::Ok, this);
errorMessage.exec();
}
void GLView::setupProgram(const QString &context, QOpenGLShaderProgram *dest, const char *vert, const char *frag)
{
if (!dest->addShaderFromSourceCode(QOpenGLShader::Vertex, vert)) {
error(context, "vertex shader",dest->log());
}
if (!dest->addShaderFromSourceCode(QOpenGLShader::Fragment, frag)) {
error(context, "fragment shader",dest->log());
}
if (!dest->link()) {
error(context, "link",dest->log());
}
}
void GLView::initializeGL()
{
initializeOpenGLFunctions();
@ -529,24 +552,16 @@ void GLView::initializeGL()
// set up shader
m_program = new QOpenGLShaderProgram();
m_program->addShaderFromSourceCode(QOpenGLShader::Vertex, s_vertShader);
m_program->addShaderFromSourceCode(QOpenGLShader::Fragment, s_fragShader);
assert(m_program->link());
setupProgram("m_program", m_program, s_vertShader, s_fragShader);
m_skybox_program = new QOpenGLShaderProgram();
m_skybox_program->addShaderFromSourceCode(QOpenGLShader::Vertex, s_skyboxVertShader);
m_skybox_program->addShaderFromSourceCode(QOpenGLShader::Fragment, s_skyboxFragShader);
assert(m_skybox_program->link());
setupProgram("m_skybox_program", m_skybox_program, s_skyboxVertShader,s_skyboxFragShader);
m_program_simple = new QOpenGLShaderProgram();
m_program_simple->addShaderFromSourceCode(QOpenGLShader::Vertex, s_vertShader_Simple);
m_program_simple->addShaderFromSourceCode(QOpenGLShader::Fragment, s_fragShader_Simple);
assert(m_program_simple->link());
setupProgram("m_program_simple", m_program_simple, s_vertShader_Simple, s_fragShader_Simple);
m_program_wireframe = new QOpenGLShaderProgram();
m_program_wireframe->addShaderFromSourceCode(QOpenGLShader::Vertex, s_vertShader_Wireframe);
m_program_wireframe->addShaderFromSourceCode(QOpenGLShader::Fragment, s_fragShader_Wireframe);
assert(m_program_wireframe->link());
setupProgram("m_program_wireframe", m_program_wireframe, s_vertShader_Wireframe, s_fragShader_Wireframe);
m_program->bind();
m_program_mvp_location = m_program->uniformLocation("MVP");

3
lightpreview/glview.h
View File

@ -260,6 +260,9 @@ public:
void takeScreenshot(QString destPath, int w, int h);
private:
void error(const QString &context, const QString &context2, const QString &log);
void setupProgram(const QString &context, QOpenGLShaderProgram *dest, const char *vert, const char *frag);
protected:
void initializeGL() override;
void paintGL() override;