community/krita: fix up texture management by using OpenGLES approach in all cases

2 files changed, 80 insertions, 10 deletions

diff --git a/community/krita/APKBUILD b/community/krita/APKBUILD
index 0a6acf3661..e54ea44900 100644
--- a/community/krita/APKBUILD
+++ b/community/krita/APKBUILD
@@ -37,4 +37,4 @@ package() {
 
 sha512sums="66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0  krita-4.2.9.tar.xz
 e7a9117d012df4181e05de970f2210264b8685ee76c98b33795f8095d9a17b24b20e6ce920f944b4b5cb940cf672af5ba5fd0ffae9f53085a4f97da61b1e69f6  fix-crash-with-c-locale.patch
-5743461739a658bb471dd6b5434f3a396048cd17cd54127feb4572fa6b3a414d48658aa15b52f7f9c1b6d787caec1af1db1739176f7d6a259b2c32396603fd17  pure-opengles-compat.patch"
+078f8ac6c8dfbd27202aca8a068fa77ca37c92aaa36fb725a8a9b7b97801da042f3dfd52fb115cea1c4cbb2984a9cb16e8a611a4507fffacdc4b4d8a85c091fa  pure-opengles-compat.patch"
diff --git a/community/krita/pure-opengles-compat.patch b/community/krita/pure-opengles-compat.patch
index 43d6886cb7..abd7b5f87b 100644
--- a/community/krita/pure-opengles-compat.patch
+++ b/community/krita/pure-opengles-compat.patch
@@ -1,6 +1,9 @@
+Consistently use OpenGLES functions instead of OpenGL 2.1 functions.
+
+Upstream: Pending submission
 diff -urN krita-4.2.9.orig/libs/ui/opengl/kis_opengl_canvas2.cpp krita-4.2.9/libs/ui/opengl/kis_opengl_canvas2.cpp
---- krita-4.2.9.orig/libs/ui/opengl/kis_opengl_canvas2.cpp      2020-05-22 01:52:07.430282697 -0600
-+++ krita-4.2.9/libs/ui/opengl/kis_opengl_canvas2.cpp   2020-05-22 01:53:24.310617820 -0600
+--- krita-4.2.9.orig/libs/ui/opengl/kis_opengl_canvas2.cpp      2020-05-22 02:19:15.233324983 -0600
++++ krita-4.2.9/libs/ui/opengl/kis_opengl_canvas2.cpp   2020-05-22 02:20:49.730356628 -0600
 @@ -46,10 +46,6 @@
  #include "KisOpenGLModeProber.h"
  #include <KoColorModelStandardIds.h>
@@ -40,17 +43,84 @@ diff -urN krita-4.2.9.orig/libs/ui/opengl/kis_opengl_canvas2.cpp krita-4.2.9/lib
  
      KisConfig cfg(true);
      d->openGLImageTextures->setProofingConfig(canvas()->proofingConfiguration());
-@@ -446,13 +428,7 @@
-         glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+@@ -442,21 +424,8 @@
+     modelMatrix = projectionMatrix * modelMatrix;
+     d->solidColorShader->setUniformValue(d->solidColorShader->location(Uniform::ModelViewProjection), modelMatrix);
  
-         glEnable(GL_COLOR_LOGIC_OP);
+-    if (!KisOpenGL::hasOpenGLES()) {
+-        glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
+-
+-        glEnable(GL_COLOR_LOGIC_OP);
 -#ifndef Q_OS_MACOS
 -        if (d->glFn201) {
 -            d->glFn201->glLogicOp(GL_XOR);
 -        }
 -#else
-         glLogicOp(GL_XOR);
+-        glLogicOp(GL_XOR);
 -#endif
-     } else {
-         glEnable(GL_BLEND);
-         glBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);
+-    } else {
+-        glEnable(GL_BLEND);
+-        glBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);
+-    }
++    glEnable(GL_BLEND);
++    glBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ZERO, GL_ONE, GL_ONE);
+ 
+     d->solidColorShader->setUniformValue(
+                 d->solidColorShader->location(Uniform::FragmentColor),
+@@ -497,11 +466,7 @@
+         d->outlineVAO.release();
+     }
+ 
+-    if (!KisOpenGL::hasOpenGLES()) {
+-        glDisable(GL_COLOR_LOGIC_OP);
+-    } else {
+-        glDisable(GL_BLEND);
+-    }
++    glDisable(GL_BLEND);
+ 
+     d->solidColorShader->release();
+ }
+diff -urN krita-4.2.9.orig/libs/ui/opengl/kis_opengl_image_textures.cpp krita-4.2.9/libs/ui/opengl/kis_opengl_image_textures.cpp
+--- krita-4.2.9.orig/libs/ui/opengl/kis_opengl_image_textures.cpp       2020-05-22 02:19:15.233324983 -0600
++++ krita-4.2.9/libs/ui/opengl/kis_opengl_image_textures.cpp    2020-05-22 02:23:39.357678451 -0600
+@@ -473,36 +473,16 @@
+ namespace {
+ void initializeRGBA16FTextures(QOpenGLContext *ctx, KisGLTexturesInfo &texturesInfo, KoID &destinationColorDepthId)
+ {
+-    if (KisOpenGL::hasOpenGLES() || KisOpenGL::hasOpenGL3()) {
+-        texturesInfo.internalFormat = GL_RGBA16F;
+-        dbgUI << "Using half (GLES or GL3)";
+-    } else if (ctx->hasExtension("GL_ARB_texture_float")) {
+-        texturesInfo.internalFormat = GL_RGBA16F_ARB;
+-        dbgUI << "Using ARB half";
+-    }
+-    else if (ctx->hasExtension("GL_ATI_texture_float")) {
+-        texturesInfo.internalFormat = GL_RGBA_FLOAT16_ATI;
+-        dbgUI << "Using ATI half";
+-    }
++    texturesInfo.internalFormat = GL_RGBA16F;
++    dbgUI << "Using half (GLES or GL3)";
+ 
+     bool haveBuiltInOpenExr = false;
+ #ifdef HAVE_OPENEXR
+     haveBuiltInOpenExr = true;
+ #endif
+ 
+-    if (haveBuiltInOpenExr && (KisOpenGL::hasOpenGLES() || KisOpenGL::hasOpenGL3())) {
+-        texturesInfo.type = GL_HALF_FLOAT;
+-        destinationColorDepthId = Float16BitsColorDepthID;
+-        dbgUI << "Pixel type half (GLES or GL3)";
+-    } else if (haveBuiltInOpenExr && ctx->hasExtension("GL_ARB_half_float_pixel")) {
+-        texturesInfo.type = GL_HALF_FLOAT_ARB;
+-        destinationColorDepthId = Float16BitsColorDepthID;
+-        dbgUI << "Pixel type half";
+-    } else {
+-        texturesInfo.type = GL_FLOAT;
+-        destinationColorDepthId = Float32BitsColorDepthID;
+-        dbgUI << "Pixel type float";
+-    }
++    texturesInfo.type = GL_HALF_FLOAT;
++    destinationColorDepthId = Float16BitsColorDepthID;
+     texturesInfo.format = GL_RGBA;
+ }
+ }