diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-22 13:47:08 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 13:17:33 +0100 |
commit | 502d3d6744913899da87acfda5ebdab42c40329e (patch) | |
tree | 16658a328503bfd5a62b4fd5d69ffb66e9854b18 /examples/opengl | |
parent | d1be8b9ceb2c7b20bbe53a07154c79699540ea3d (diff) | |
parent | 06bb315beb6c2c398223cfe52cbc7f66e14a8557 (diff) |
Merge remote-tracking branch 'origin/dev' into merge-dev
Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
Diffstat (limited to 'examples/opengl')
-rw-r--r-- | examples/opengl/2dpainting/2dpainting.pro | 2 | ||||
-rw-r--r-- | examples/opengl/computegles31/computegles31.pro | 2 | ||||
-rw-r--r-- | examples/opengl/computegles31/glwindow.cpp | 6 | ||||
-rw-r--r-- | examples/opengl/cube/cube.pro | 2 | ||||
-rw-r--r-- | examples/opengl/hellogl2/hellogl2.pro | 2 | ||||
-rw-r--r-- | examples/opengl/hellogles3/hellogles3.pro | 2 | ||||
-rw-r--r-- | examples/opengl/qopenglwidget/qopenglwidget.pro | 2 | ||||
-rw-r--r-- | examples/opengl/qopenglwindow/qopenglwindow.pro | 1 | ||||
-rw-r--r-- | examples/opengl/textures/textures.pro | 2 | ||||
-rw-r--r-- | examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro | 2 |
10 files changed, 14 insertions, 9 deletions
diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro index b9611f5b40..20fe4739a5 100644 --- a/examples/opengl/2dpainting/2dpainting.pro +++ b/examples/opengl/2dpainting/2dpainting.pro @@ -1,4 +1,4 @@ -QT += widgets +QT += widgets opengl HEADERS = glwidget.h \ helper.h \ diff --git a/examples/opengl/computegles31/computegles31.pro b/examples/opengl/computegles31/computegles31.pro index 5b9d7e4387..8d9b00ba83 100644 --- a/examples/opengl/computegles31/computegles31.pro +++ b/examples/opengl/computegles31/computegles31.pro @@ -1,3 +1,5 @@ +QT += opengl + HEADERS = $$PWD/glwindow.h SOURCES = $$PWD/glwindow.cpp \ diff --git a/examples/opengl/computegles31/glwindow.cpp b/examples/opengl/computegles31/glwindow.cpp index 2194137cfd..5e8d45da24 100644 --- a/examples/opengl/computegles31/glwindow.cpp +++ b/examples/opengl/computegles31/glwindow.cpp @@ -171,7 +171,7 @@ static const char *fsDisplaySource = "}\n"; static const char *csComputeSourceV = - "#define COMPUTEPATCHSIZE 32 \n" + "#define COMPUTEPATCHSIZE 10 // Setting this to 10 to comply with MAX_COMPUTE_WORK_GROUP_INVOCATIONS for both OpenGL and OpenGLES - see QTBUG-79374 \n" "#define IMGFMT rgba8 \n" "layout (local_size_x = COMPUTEPATCHSIZE, local_size_y = COMPUTEPATCHSIZE) in;\n" "layout(binding=0, IMGFMT) uniform readonly highp image2D inputImage; // Use a sampler to improve performance \n" @@ -212,7 +212,7 @@ static const char *csComputeSourceV = "}\n"; static const char *csComputeSourceH = - "#define COMPUTEPATCHSIZE 32 \n" + "#define COMPUTEPATCHSIZE 10 \n" "#define IMGFMT rgba8 \n" "layout (local_size_x = COMPUTEPATCHSIZE, local_size_y = COMPUTEPATCHSIZE) in;\n" "layout(binding=0, IMGFMT) uniform readonly highp image2D inputImage; // Use a sampler to improve performance \n" @@ -381,7 +381,7 @@ void GLWindow::paintGL() // Process input image - QSize workGroups = getWorkGroups( 32, QSize(m_texImageInput->width(), m_texImageInput->height())); + QSize workGroups = getWorkGroups(10, QSize(m_texImageInput->width(), m_texImageInput->height())); // Pass 1 f->glBindImageTexture(0, m_texImageInput->textureId(), 0, 0, 0, GL_READ_WRITE, GL_RGBA8); f->glBindImageTexture(1, m_texImageTmp->textureId(), 0, 0, 0, GL_READ_WRITE, GL_RGBA8); diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro index b9416f1a9d..07724e247e 100644 --- a/examples/opengl/cube/cube.pro +++ b/examples/opengl/cube/cube.pro @@ -1,4 +1,4 @@ -QT += core gui widgets +QT += core gui widgets opengl TARGET = cube TEMPLATE = app diff --git a/examples/opengl/hellogl2/hellogl2.pro b/examples/opengl/hellogl2/hellogl2.pro index 3a52e04d74..834ae82e1f 100644 --- a/examples/opengl/hellogl2/hellogl2.pro +++ b/examples/opengl/hellogl2/hellogl2.pro @@ -8,7 +8,7 @@ SOURCES = glwidget.cpp \ mainwindow.cpp \ logo.cpp -QT += widgets +QT += widgets opengl # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl2 diff --git a/examples/opengl/hellogles3/hellogles3.pro b/examples/opengl/hellogles3/hellogles3.pro index e0d4c25ca6..8d9fbe25ca 100644 --- a/examples/opengl/hellogles3/hellogles3.pro +++ b/examples/opengl/hellogles3/hellogles3.pro @@ -1,3 +1,5 @@ +QT += opengl + HEADERS = $$PWD/glwindow.h \ $$PWD/../hellogl2/logo.h diff --git a/examples/opengl/qopenglwidget/qopenglwidget.pro b/examples/opengl/qopenglwidget/qopenglwidget.pro index 0165285c02..1df3de1290 100644 --- a/examples/opengl/qopenglwidget/qopenglwidget.pro +++ b/examples/opengl/qopenglwidget/qopenglwidget.pro @@ -1,4 +1,4 @@ -QT += widgets +QT += widgets opengl SOURCES += main.cpp \ glwidget.cpp \ diff --git a/examples/opengl/qopenglwindow/qopenglwindow.pro b/examples/opengl/qopenglwindow/qopenglwindow.pro index dad4b58158..e7073a324b 100644 --- a/examples/opengl/qopenglwindow/qopenglwindow.pro +++ b/examples/opengl/qopenglwindow/qopenglwindow.pro @@ -1,6 +1,7 @@ TEMPLATE = app TARGET = qopenglwindow INCLUDEPATH += . +QT += opengl RESOURCES += shaders.qrc diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro index 7a7d19bee6..ae1ae4d34c 100644 --- a/examples/opengl/textures/textures.pro +++ b/examples/opengl/textures/textures.pro @@ -6,7 +6,7 @@ SOURCES = glwidget.cpp \ RESOURCES = textures.qrc -QT += widgets +QT += widgets opengl # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures diff --git a/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro b/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro index 4e941b28c4..70694459b2 100644 --- a/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro +++ b/examples/opengl/threadedqopenglwidget/threadedqopenglwidget.pro @@ -1,4 +1,4 @@ -QT += widgets +QT += widgets opengl SOURCES += main.cpp \ glwidget.cpp \ |