1From 2e1bbb5e28ccf7da4d2aba2e725baedbf511856a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 29 Nov 2021 17:24:50 -0800
4Subject: [PATCH] Fix vulkan buffer formats for GLES2
5
6Fixes
7vulkanserverbufferintegration.cpp:163:77: error: use of undeclared identifier 'GL_RGBA8'
8    if (extraDebug) qDebug() << "format" << Qt::hex  << m_internalFormat << GL_RGBA8;
9                                                                            ^
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 .../client/vulkan-server/vulkanserverbufferintegration.cpp  | 2 +-
15 .../vulkan-server/vulkanserverbufferintegration.cpp         | 6 +++---
16 2 files changed, 4 insertions(+), 4 deletions(-)
17
18diff --git a/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp b/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp
19index b4403855..3f4520e4 100644
20--- a/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp
21+++ b/src/hardwareintegration/client/vulkan-server/vulkanserverbufferintegration.cpp
22@@ -160,7 +160,7 @@ void VulkanServerBuffer::import()
23     if (extraDebug) qDebug() << "bound texture" << Qt::hex << glGetError();
24     funcs->glTexStorageMem2DEXT(GL_TEXTURE_2D, 1, m_internalFormat, m_size.width(), m_size.height(), m_memoryObject, 0 );
25     if (extraDebug) qDebug() << "glTexStorageMem2DEXT" << Qt::hex << glGetError();
26-    if (extraDebug) qDebug() << "format" << Qt::hex  << m_internalFormat << GL_RGBA8;
27+    if (extraDebug) qDebug() << "format" << Qt::hex  << m_internalFormat << GL_RGBA;
28 }
29
30 QOpenGLTexture *VulkanServerBuffer::toOpenGlTexture()
31diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp
32index 69af5f9f..558a4d62 100644
33--- a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp
34+++ b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp
35@@ -141,14 +141,14 @@ VulkanServerBuffer::VulkanServerBuffer(VulkanServerBufferIntegration *integratio
36     m_format = format;
37     switch (m_format) {
38         case RGBA32:
39-            m_glInternalFormat = GL_RGBA8;
40+            m_glInternalFormat = GL_RGBA;
41             break;
42         // case A8:
43         //     m_glInternalFormat = GL_R8;
44         //     break;
45         default:
46             qWarning("VulkanServerBuffer: unsupported format");
47-            m_glInternalFormat = GL_RGBA8;
48+            m_glInternalFormat = GL_RGBA;
49             break;
50     }
51
52@@ -229,7 +229,7 @@ QOpenGLTexture *VulkanServerBuffer::toOpenGlTexture()
53     if (extraDebug) qDebug() << "bound texture" << texId << Qt::hex << glGetError();
54     funcs->glTexStorageMem2DEXT(GL_TEXTURE_2D, 1, m_glInternalFormat, m_size.width(), m_size.height(), m_memoryObject, 0 );
55     if (extraDebug) qDebug() << "glTexStorageMem2DEXT" << Qt::hex << glGetError();
56-    if (extraDebug) qDebug() << "format" << Qt::hex  << m_glInternalFormat << GL_RGBA8;
57+    if (extraDebug) qDebug() << "format" << Qt::hex  << m_glInternalFormat << GL_RGBA;
58
59
60     return m_texture;
61--
622.34.1
63
64