nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Use OpenGL 3.2 Core

Browse Source
This commit is contained in:
Dušan Poizl
2022-04-07 09:58:52 +02:00
parent b67c2d520e
commit 888e3d86a9
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imagescrollareagl.cpp
+3 -2
View File
@@ -173,8 +173,9 @@ void ImageWidget::resizeGL(int w, int h)
void ImageWidget::initializeGL() void ImageWidget::initializeGL()
{ {
f = context()->versionFunctions<QOpenGLFunctions_3_0>(); f = context()->functions();
f->glClearColor(0.5f, 0.5f, 0.5f, 1.0f); f->glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
QOpenGLFunctions_3_2_Core *f3 = context()->versionFunctions<QOpenGLFunctions_3_2_Core>();
m_vao = std::unique_ptr<QOpenGLVertexArrayObject>(new QOpenGLVertexArrayObject); m_vao = std::unique_ptr<QOpenGLVertexArrayObject>(new QOpenGLVertexArrayObject);
m_vao->create(); m_vao->create();
@@ -209,7 +210,7 @@ void ImageWidget::initializeGL()
m_program = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram); m_program = std::unique_ptr<QOpenGLShaderProgram>(new QOpenGLShaderProgram);
m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/image.vert"); m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, ":/shaders/image.vert");
m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/image.frag"); m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, ":/shaders/image.frag");
f->glBindFragDataLocation(m_program->programId(), 0, "color"); if(f3)f3->glBindFragDataLocation(m_program->programId(), 0, "color");
if(!m_program->link()) if(!m_program->link())
{ {
qDebug() << "Link failed" << m_program->log(); qDebug() << "Link failed" << m_program->log();
imagescrollareagl.h
+2 -2
View File
@@ -4,7 +4,7 @@
#include <memory> #include <memory>
#include <QObject> #include <QObject>
#include <QOpenGLWidget> #include <QOpenGLWidget>
#include <QOpenGLFunctions_3_0> #include <QOpenGLFunctions_3_2_Core>
#include <QOpenGLShaderProgram> #include <QOpenGLShaderProgram>
#include <QOpenGLBuffer> #include <QOpenGLBuffer>
#include <QOpenGLTexture> #include <QOpenGLTexture>
@@ -24,7 +24,7 @@ typedef enum
class ImageWidget : public QOpenGLWidget class ImageWidget : public QOpenGLWidget
{ {
Q_OBJECT Q_OBJECT
QOpenGLFunctions_3_0 *f; QOpenGLFunctions *f;
std::unique_ptr<QOpenGLShaderProgram> m_program; std::unique_ptr<QOpenGLShaderProgram> m_program;
std::unique_ptr<QOpenGLBuffer> m_buffer; std::unique_ptr<QOpenGLBuffer> m_buffer;
std::unique_ptr<QOpenGLTexture> m_image; std::unique_ptr<QOpenGLTexture> m_image;
main.cpp
+2 -1
View File
@@ -6,8 +6,9 @@ int main(int argc, char *argv[])
{ {
QSurfaceFormat format; QSurfaceFormat format;
format.setMajorVersion(3); format.setMajorVersion(3);
format.setMinorVersion(0); format.setMinorVersion(2);
format.setOption(QSurfaceFormat::DebugContext); format.setOption(QSurfaceFormat::DebugContext);
format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
QSurfaceFormat::setDefaultFormat(format); QSurfaceFormat::setDefaultFormat(format);
QApplication a(argc, argv); QApplication a(argc, argv);