diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-25 01:00:25 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-11-25 11:30:04 +0100 |
| commit | 58c69df4d38324644bc49ec5f42ee8343a454b2d (patch) | |
| tree | de0a1ce603292dcaff134d4e1e8ab064295515a2 /examples/opengl | |
| parent | 03b1d2c44940322208c12c7bceee376b51d8e852 (diff) | |
| parent | 59a705e3710b0ba93bb698e3223241cfac932948 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/tools/qhash.h
src/gui/kernel/qevent.h
src/widgets/kernel/qshortcut.cpp
src/widgets/kernel/qshortcut.h
Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620
Diffstat (limited to 'examples/opengl')
| -rw-r--r-- | examples/opengl/computegles31/glwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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); |