community/krita: fix up another desktop opengl-ism

2 files changed, 21 insertions, 5 deletions

diff --git a/community/krita/APKBUILD b/community/krita/APKBUILD
index e54ea44900..11666d2c52 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
-078f8ac6c8dfbd27202aca8a068fa77ca37c92aaa36fb725a8a9b7b97801da042f3dfd52fb115cea1c4cbb2984a9cb16e8a611a4507fffacdc4b4d8a85c091fa  pure-opengles-compat.patch"
+52eb74afcb2ac1821a3d741567ae8360086644aabe5dfe646ec275b10565c8a3c5a854b7758df1743eb2c0ec7a5e9585280bbf11fabce5b059934f526c671f02  pure-opengles-compat.patch"
diff --git a/community/krita/pure-opengles-compat.patch b/community/krita/pure-opengles-compat.patch
index abd7b5f87b..202489fe28 100644
--- a/community/krita/pure-opengles-compat.patch
+++ b/community/krita/pure-opengles-compat.patch
@@ -1,6 +1,3 @@
-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 02:19:15.233324983 -0600
 +++ krita-4.2.9/libs/ui/opengl/kis_opengl_canvas2.cpp   2020-05-22 02:20:49.730356628 -0600
@@ -82,7 +79,7 @@ diff -urN krita-4.2.9.orig/libs/ui/opengl/kis_opengl_canvas2.cpp krita-4.2.9/lib
  }
 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
++++ krita-4.2.9/libs/ui/opengl/kis_opengl_image_textures.cpp    2020-05-22 02:36:06.923918655 -0600
 @@ -473,36 +473,16 @@
  namespace {
  void initializeRGBA16FTextures(QOpenGLContext *ctx, KisGLTexturesInfo &texturesInfo, KoID &destinationColorDepthId)
@@ -124,3 +121,22 @@ diff -urN krita-4.2.9.orig/libs/ui/opengl/kis_opengl_image_textures.cpp krita-4.
      texturesInfo.format = GL_RGBA;
  }
  }
+@@ -543,16 +523,8 @@
+             initializeRGBA16FTextures(ctx, m_texturesInfo, destinationColorDepthId);
+         }
+         else if (colorDepthId == Float32BitsColorDepthID) {
+-            if (KisOpenGL::hasOpenGLES() || KisOpenGL::hasOpenGL3()) {
+-                m_texturesInfo.internalFormat = GL_RGBA32F;
+-                dbgUI << "Using float (GLES or GL3)";
+-            } else if (ctx->hasExtension("GL_ARB_texture_float")) {
+-                m_texturesInfo.internalFormat = GL_RGBA32F_ARB;
+-                dbgUI << "Using ARB float";
+-            } else if (ctx->hasExtension("GL_ATI_texture_float")) {
+-                m_texturesInfo.internalFormat = GL_RGBA_FLOAT32_ATI;
+-                dbgUI << "Using ATI float";
+-            }
++            m_texturesInfo.internalFormat = GL_RGBA32F;
++            dbgUI << "Using float (GLES or GL3)";
+ 
+             m_texturesInfo.type = GL_FLOAT;
+             m_texturesInfo.format = GL_RGBA;