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