Compressed texture support for vulkan server buffers

Adding new virtual function createServerBufferFromData() to the
ServerBufferIntegration class.

Change-Id: I6009fd5aec07f1794431bd52ccd56cfae9d0f77b
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
(cherry picked from commit f710489a341713c675cfd91d22ccd7bf8f29f4dd)
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

10 files changed, 560 insertions, 20 deletions

diff --git a/src/3rdparty/util/LICENSE-APACHE-2.0.txt b/src/3rdparty/util/LICENSE-APACHE-2.0.txt
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/src/3rdparty/util/LICENSE-APACHE-2.0.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/3rdparty/util/qt_attribution.json b/src/3rdparty/util/qt_attribution.json
new file mode 100644
index 000000000..07e85dc20
--- /dev/null
+++ b/src/3rdparty/util/qt_attribution.json
@@ -0,0 +1,15 @@
+[
+    {
+        "Id": "VK_FORMAT_H",
+        "Name": "Wayland Protocol",
+        "QDocModule": "qtwaylandcompositor",
+        "QtUsage": "Used in the Qt Wayland Compositor vulkan-server-buffer.",
+        "Files": "vk_format.h",
+        "Description": "Vulkan format conversion from OpenGL.",
+        "DownloadLocation": "https://github.com/KhronosGroup/KTX-Software/blob/master/lib/vk_format.h",
+        "License": "Apache License 2.0",
+        "LicenseId": "Apache-2.0",
+        "LicenseFile": "LICENSE-APACHE-2.0.txt",
+        "Copyright": "Copyright (c) 2016 Oculus VR, LLC. All Rights reserved."
+    }
+]
diff --git a/src/3rdparty/util/vk_format.h b/src/3rdparty/util/vk_format.h
new file mode 100644
index 000000000..d17783c75
--- /dev/null
+++ b/src/3rdparty/util/vk_format.h
@@ -0,0 +1,264 @@
+/*
+================================================================================================
+
+Description :   Vulkan format conversion from OpenGL.
+Author      :   J.M.P. van Waveren
+Date        :   07/17/2016
+Language    :   C99
+Copyright   :   Copyright (c) 2016 Oculus VR, LLC. All Rights reserved.
+
+
+LICENSE
+-------
+
+Copyright (c) 2016 Oculus VR, LLC.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+================================================================================================
+*/
+
+#if !defined( VK_FORMAT_H )
+#define VK_FORMAT_H
+
+static inline VkFormat vkGetFormatFromOpenGLInternalFormat( const GLenum internalFormat )
+{
+    switch ( internalFormat )
+    {
+        //
+        // 8 bits per component
+        //
+#ifdef GL_R8
+        case GL_R8:                                             return VK_FORMAT_R8_UNORM;                  // 1-component, 8-bit unsigned normalized
+        case GL_RG8:                                            return VK_FORMAT_R8G8_UNORM;                // 2-component, 8-bit unsigned normalized
+#endif
+        case GL_RGB8:                                           return VK_FORMAT_R8G8B8_UNORM;              // 3-component, 8-bit unsigned normalized
+        case GL_RGBA8:                                          return VK_FORMAT_R8G8B8A8_UNORM;            // 4-component, 8-bit unsigned normalized
+
+        case GL_R8_SNORM:                                       return VK_FORMAT_R8_SNORM;                  // 1-component, 8-bit signed normalized
+        case GL_RG8_SNORM:                                      return VK_FORMAT_R8G8_SNORM;                // 2-component, 8-bit signed normalized
+        case GL_RGB8_SNORM:                                     return VK_FORMAT_R8G8B8_SNORM;              // 3-component, 8-bit signed normalized
+        case GL_RGBA8_SNORM:                                    return VK_FORMAT_R8G8B8A8_SNORM;            // 4-component, 8-bit signed normalized
+
+        case GL_R8UI:                                           return VK_FORMAT_R8_UINT;                   // 1-component, 8-bit unsigned integer
+        case GL_RG8UI:                                          return VK_FORMAT_R8G8_UINT;                 // 2-component, 8-bit unsigned integer
+        case GL_RGB8UI:                                         return VK_FORMAT_R8G8B8_UINT;               // 3-component, 8-bit unsigned integer
+        case GL_RGBA8UI:                                        return VK_FORMAT_R8G8B8A8_UINT;             // 4-component, 8-bit unsigned integer
+
+        case GL_R8I:                                            return VK_FORMAT_R8_SINT;                   // 1-component, 8-bit signed integer
+        case GL_RG8I:                                           return VK_FORMAT_R8G8_SINT;                 // 2-component, 8-bit signed integer
+        case GL_RGB8I:                                          return VK_FORMAT_R8G8B8_SINT;               // 3-component, 8-bit signed integer
+        case GL_RGBA8I:                                         return VK_FORMAT_R8G8B8A8_SINT;             // 4-component, 8-bit signed integer
+
+        case GL_SR8_EXT:                                        return VK_FORMAT_R8_SRGB;                   // 1-component, 8-bit sRGB
+#ifdef GL_SRG8_EXT
+        case GL_SRG8_EXT:                                       return VK_FORMAT_R8G8_SRGB;                 // 2-component, 8-bit sRGB
+#endif
+#ifdef GL_SRGB8_NV
+        case GL_SRGB8_NV:                                       return VK_FORMAT_R8G8B8_SRGB;               // 3-component, 8-bit sRGB
+#endif
+#ifdef GL_SRGB8_ALPHA8
+        case GL_SRGB8_ALPHA8:                                   return VK_FORMAT_R8G8B8A8_SRGB;             // 4-component, 8-bit sRGB
+#endif
+        //
+        // 16 bits per component
+        //
+#ifdef GL_R16_EXT
+        case GL_R16_EXT:                                            return VK_FORMAT_R16_UNORM;                 // 1-component, 16-bit unsigned normalized
+        case GL_RG16_EXT:                                           return VK_FORMAT_R16G16_UNORM;              // 2-component, 16-bit unsigned normalized
+#endif
+        case GL_RGB16_EXT:                                          return VK_FORMAT_R16G16B16_UNORM;           // 3-component, 16-bit unsigned normalized
+        case GL_RGBA16_EXT:                                         return VK_FORMAT_R16G16B16A16_UNORM;        // 4-component, 16-bit unsigned normalized
+
+#ifdef GL_R16_SNORM_EXT
+        case GL_R16_SNORM_EXT:                                      return VK_FORMAT_R16_SNORM;                 // 1-component, 16-bit signed normalized
+        case GL_RG16_SNORM_EXT:                                     return VK_FORMAT_R16G16_SNORM;              // 2-component, 16-bit signed normalized
+        case GL_RGB16_SNORM_EXT:                                    return VK_FORMAT_R16G16B16_SNORM;           // 3-component, 16-bit signed normalized
+        case GL_RGBA16_SNORM_EXT:                                   return VK_FORMAT_R16G16B16A16_SNORM;        // 4-component, 16-bit signed normalized
+#endif
+
+        case GL_R16UI:                                          return VK_FORMAT_R16_UINT;                  // 1-component, 16-bit unsigned integer
+        case GL_RG16UI:                                         return VK_FORMAT_R16G16_UINT;               // 2-component, 16-bit unsigned integer
+        case GL_RGB16UI:                                        return VK_FORMAT_R16G16B16_UINT;            // 3-component, 16-bit unsigned integer
+        case GL_RGBA16UI:                                       return VK_FORMAT_R16G16B16A16_UINT;         // 4-component, 16-bit unsigned integer
+
+        case GL_R16I:                                           return VK_FORMAT_R16_SINT;                  // 1-component, 16-bit signed integer
+        case GL_RG16I:                                          return VK_FORMAT_R16G16_SINT;               // 2-component, 16-bit signed integer
+        case GL_RGB16I:                                         return VK_FORMAT_R16G16B16_SINT;            // 3-component, 16-bit signed integer
+        case GL_RGBA16I:                                        return VK_FORMAT_R16G16B16A16_SINT;         // 4-component, 16-bit signed integer
+
+        case GL_R16F:                                           return VK_FORMAT_R16_SFLOAT;                // 1-component, 16-bit floating-point
+        case GL_RG16F:                                          return VK_FORMAT_R16G16_SFLOAT;             // 2-component, 16-bit floating-point
+        case GL_RGB16F:                                         return VK_FORMAT_R16G16B16_SFLOAT;          // 3-component, 16-bit floating-point
+        case GL_RGBA16F:                                        return VK_FORMAT_R16G16B16A16_SFLOAT;       // 4-component, 16-bit floating-point
+
+        //
+        // 32 bits per component
+        //
+        case GL_R32UI:                                          return VK_FORMAT_R32_UINT;                  // 1-component, 32-bit unsigned integer
+        case GL_RG32UI:                                         return VK_FORMAT_R32G32_UINT;               // 2-component, 32-bit unsigned integer
+        case GL_RGB32UI:                                        return VK_FORMAT_R32G32B32_UINT;            // 3-component, 32-bit unsigned integer
+        case GL_RGBA32UI:                                       return VK_FORMAT_R32G32B32A32_UINT;         // 4-component, 32-bit unsigned integer
+
+        case GL_R32I:                                           return VK_FORMAT_R32_SINT;                  // 1-component, 32-bit signed integer
+        case GL_RG32I:                                          return VK_FORMAT_R32G32_SINT;               // 2-component, 32-bit signed integer
+        case GL_RGB32I:                                         return VK_FORMAT_R32G32B32_SINT;            // 3-component, 32-bit signed integer
+        case GL_RGBA32I:                                        return VK_FORMAT_R32G32B32A32_SINT;         // 4-component, 32-bit signed integer
+
+        case GL_R32F:                                           return VK_FORMAT_R32_SFLOAT;                // 1-component, 32-bit floating-point
+        case GL_RG32F:                                          return VK_FORMAT_R32G32_SFLOAT;             // 2-component, 32-bit floating-point
+        case GL_RGB32F:                                         return VK_FORMAT_R32G32B32_SFLOAT;          // 3-component, 32-bit floating-point
+        case GL_RGBA32F:                                        return VK_FORMAT_R32G32B32A32_SFLOAT;       // 4-component, 32-bit floating-point
+
+        //
+        // Packed
+        //
+//        case GL_R3_G3_B2:                                       return VK_FORMAT_UNDEFINED;                 // 3-component 3:3:2,       unsigned normalized
+//        case GL_RGB4:                                           return VK_FORMAT_UNDEFINED;                 // 3-component 4:4:4,       unsigned normalized
+#ifdef GL_RGB5
+        case GL_RGB5:                                           return VK_FORMAT_R5G5B5A1_UNORM_PACK16;     // 3-component 5:5:5,       unsigned normalized
+#endif
+        case GL_RGB565:                                         return VK_FORMAT_R5G6B5_UNORM_PACK16;       // 3-component 5:6:5,       unsigned normalized
+        case GL_RGB10_EXT:                                          return VK_FORMAT_A2R10G10B10_UNORM_PACK32;  // 3-component 10:10:10,    unsigned normalized
+        // case GL_RGB12:                                          return VK_FORMAT_UNDEFINED;                 // 3-component 12:12:12,    unsigned normalized
+        // case GL_RGBA2:                                          return VK_FORMAT_UNDEFINED;                 // 4-component 2:2:2:2,     unsigned normalized
+        case GL_RGBA4:                                          return VK_FORMAT_R4G4B4A4_UNORM_PACK16;     // 4-component 4:4:4:4,     unsigned normalized
+//        case GL_RGBA12:                                         return VK_FORMAT_UNDEFINED;                 // 4-component 12:12:12:12, unsigned normalized
+        case GL_RGB5_A1:                                        return VK_FORMAT_A1R5G5B5_UNORM_PACK16;     // 4-component 5:5:5:1,     unsigned normalized
+        case GL_RGB10_A2:                                       return VK_FORMAT_A2R10G10B10_UNORM_PACK32;  // 4-component 10:10:10:2,  unsigned normalized
+        case GL_RGB10_A2UI:                                     return VK_FORMAT_A2R10G10B10_UINT_PACK32;   // 4-component 10:10:10:2,  unsigned integer
+        case GL_R11F_G11F_B10F:                                 return VK_FORMAT_B10G11R11_UFLOAT_PACK32;   // 3-component 11:11:10,    floating-point
+        case GL_RGB9_E5:                                        return VK_FORMAT_E5B9G9R9_UFLOAT_PACK32;    // 3-component/exp 9:9:9/5, floating-point
+
+        //
+        // S3TC/DXT/BC
+        //
+
+        case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:                   return VK_FORMAT_BC1_RGB_UNORM_BLOCK;       // line through 3D space, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:                  return VK_FORMAT_BC1_RGBA_UNORM_BLOCK;      // line through 3D space plus 1-bit alpha, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:                  return VK_FORMAT_BC2_UNORM_BLOCK;           // line through 3D space plus line through 1D space, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:                  return VK_FORMAT_BC3_UNORM_BLOCK;           // line through 3D space plus 4-bit alpha, 4x4 blocks, unsigned normalized
+
+        case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:                  return VK_FORMAT_BC1_RGB_SRGB_BLOCK;        // line through 3D space, 4x4 blocks, sRGB
+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:            return VK_FORMAT_BC1_RGBA_SRGB_BLOCK;       // line through 3D space plus 1-bit alpha, 4x4 blocks, sRGB
+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:            return VK_FORMAT_BC2_SRGB_BLOCK;            // line through 3D space plus line through 1D space, 4x4 blocks, sRGB
+        case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:            return VK_FORMAT_BC3_SRGB_BLOCK;            // line through 3D space plus 4-bit alpha, 4x4 blocks, sRGB
+#ifdef GL_COMPRESSED_LUMINANCE_LATC1_EXT
+        case GL_COMPRESSED_LUMINANCE_LATC1_EXT:                 return VK_FORMAT_BC4_UNORM_BLOCK;           // line through 1D space, 4x4 blocks, unsigned normalized
+#endif
+#ifdef GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT
+        case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:           return VK_FORMAT_BC5_UNORM_BLOCK;           // two lines through 1D space, 4x4 blocks, unsigned normalized
+#endif
+#ifdef GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT
+        case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:          return VK_FORMAT_BC4_SNORM_BLOCK;           // line through 1D space, 4x4 blocks, signed normalized
+#endif
+#ifdef GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT
+        case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:    return VK_FORMAT_BC5_SNORM_BLOCK;           // two lines through 1D space, 4x4 blocks, signed normalized
+#endif
+        case GL_COMPRESSED_RED_RGTC1_EXT:                           return VK_FORMAT_BC4_UNORM_BLOCK;           // line through 1D space, 4x4 blocks, unsigned normalized
+#ifdef GL_COMPRESSED_RG_RGTC2_EXT
+        case GL_COMPRESSED_RG_RGTC2_EXT:                            return VK_FORMAT_BC5_UNORM_BLOCK;           // two lines through 1D space, 4x4 blocks, unsigned normalized
+#endif
+        case GL_COMPRESSED_SIGNED_RED_RGTC1_EXT:                    return VK_FORMAT_BC4_SNORM_BLOCK;           // line through 1D space, 4x4 blocks, signed normalized
+#ifdef GL_COMPRESSED_SIGNED_RG_RGTC2_EXT
+        case GL_COMPRESSED_SIGNED_RG_RGTC2_EXT:                     return VK_FORMAT_BC5_SNORM_BLOCK;           // two lines through 1D space, 4x4 blocks, signed normalized
+#endif
+
+#if defined(GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT)
+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_EXT:             return VK_FORMAT_BC6H_UFLOAT_BLOCK;         // 3-component, 4x4 blocks, unsigned floating-point
+        case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_EXT:               return VK_FORMAT_BC6H_SFLOAT_BLOCK;         // 3-component, 4x4 blocks, signed floating-point
+        case GL_COMPRESSED_RGBA_BPTC_UNORM_EXT:                     return VK_FORMAT_BC7_UNORM_BLOCK;           // 4-component, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT:               return VK_FORMAT_BC7_SRGB_BLOCK;            // 4-component, 4x4 blocks, sRGB
+#elif defined(GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT)
+        case GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:             return VK_FORMAT_BC6H_UFLOAT_BLOCK;         // 3-component, 4x4 blocks, unsigned floating-point
+        case GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT:               return VK_FORMAT_BC6H_SFLOAT_BLOCK;         // 3-component, 4x4 blocks, signed floating-point
+        case GL_COMPRESSED_RGBA_BPTC_UNORM:                     return VK_FORMAT_BC7_UNORM_BLOCK;           // 4-component, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM:               return VK_FORMAT_BC7_SRGB_BLOCK;            // 4-component, 4x4 blocks, sRGB
+#endif
+        //
+        // ETC
+        //
+#ifdef GL_ETC1_RGB8_OES
+        case GL_ETC1_RGB8_OES:                                  return VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;   // 3-component ETC1, 4x4 blocks, unsigned normalized
+#endif
+
+        case GL_COMPRESSED_RGB8_ETC2:                           return VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK;   // 3-component ETC2, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2:       return VK_FORMAT_ETC2_R8G8B8A1_UNORM_BLOCK; // 4-component ETC2 with 1-bit alpha, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA8_ETC2_EAC:                      return VK_FORMAT_ETC2_R8G8B8A8_UNORM_BLOCK; // 4-component ETC2, 4x4 blocks, unsigned normalized
+
+        case GL_COMPRESSED_SRGB8_ETC2:                          return VK_FORMAT_ETC2_R8G8B8_SRGB_BLOCK;    // 3-component ETC2, 4x4 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2:      return VK_FORMAT_ETC2_R8G8B8A1_SRGB_BLOCK;  // 4-component ETC2 with 1-bit alpha, 4x4 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC:               return VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK;  // 4-component ETC2, 4x4 blocks, sRGB
+
+        case GL_COMPRESSED_R11_EAC:                             return VK_FORMAT_EAC_R11_UNORM_BLOCK;       // 1-component ETC, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RG11_EAC:                            return VK_FORMAT_EAC_R11G11_UNORM_BLOCK;    // 2-component ETC, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_SIGNED_R11_EAC:                      return VK_FORMAT_EAC_R11_SNORM_BLOCK;       // 1-component ETC, 4x4 blocks, signed normalized
+        case GL_COMPRESSED_SIGNED_RG11_EAC:                     return VK_FORMAT_EAC_R11G11_SNORM_BLOCK;    // 2-component ETC, 4x4 blocks, signed normalized
+
+        //
+        // ASTC
+        //
+        case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:                   return VK_FORMAT_ASTC_4x4_UNORM_BLOCK;      // 4-component ASTC, 4x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:                   return VK_FORMAT_ASTC_5x4_UNORM_BLOCK;      // 4-component ASTC, 5x4 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:                   return VK_FORMAT_ASTC_5x5_UNORM_BLOCK;      // 4-component ASTC, 5x5 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:                   return VK_FORMAT_ASTC_6x5_UNORM_BLOCK;      // 4-component ASTC, 6x5 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:                   return VK_FORMAT_ASTC_6x6_UNORM_BLOCK;      // 4-component ASTC, 6x6 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:                   return VK_FORMAT_ASTC_8x5_UNORM_BLOCK;      // 4-component ASTC, 8x5 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:                   return VK_FORMAT_ASTC_8x6_UNORM_BLOCK;      // 4-component ASTC, 8x6 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:                   return VK_FORMAT_ASTC_8x8_UNORM_BLOCK;      // 4-component ASTC, 8x8 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:                  return VK_FORMAT_ASTC_10x5_UNORM_BLOCK;     // 4-component ASTC, 10x5 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:                  return VK_FORMAT_ASTC_10x6_UNORM_BLOCK;     // 4-component ASTC, 10x6 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:                  return VK_FORMAT_ASTC_10x8_UNORM_BLOCK;     // 4-component ASTC, 10x8 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:                 return VK_FORMAT_ASTC_10x10_UNORM_BLOCK;    // 4-component ASTC, 10x10 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:                 return VK_FORMAT_ASTC_12x10_UNORM_BLOCK;    // 4-component ASTC, 12x10 blocks, unsigned normalized
+        case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:                 return VK_FORMAT_ASTC_12x12_UNORM_BLOCK;    // 4-component ASTC, 12x12 blocks, unsigned normalized
+
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:           return VK_FORMAT_ASTC_4x4_SRGB_BLOCK;       // 4-component ASTC, 4x4 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:           return VK_FORMAT_ASTC_5x4_SRGB_BLOCK;       // 4-component ASTC, 5x4 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:           return VK_FORMAT_ASTC_5x5_SRGB_BLOCK;       // 4-component ASTC, 5x5 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:           return VK_FORMAT_ASTC_6x5_SRGB_BLOCK;       // 4-component ASTC, 6x5 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:           return VK_FORMAT_ASTC_6x6_SRGB_BLOCK;       // 4-component ASTC, 6x6 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:           return VK_FORMAT_ASTC_8x5_SRGB_BLOCK;       // 4-component ASTC, 8x5 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:           return VK_FORMAT_ASTC_8x6_SRGB_BLOCK;       // 4-component ASTC, 8x6 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:           return VK_FORMAT_ASTC_8x8_SRGB_BLOCK;       // 4-component ASTC, 8x8 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:          return VK_FORMAT_ASTC_10x5_SRGB_BLOCK;      // 4-component ASTC, 10x5 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:          return VK_FORMAT_ASTC_10x6_SRGB_BLOCK;      // 4-component ASTC, 10x6 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:          return VK_FORMAT_ASTC_10x8_SRGB_BLOCK;      // 4-component ASTC, 10x8 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:         return VK_FORMAT_ASTC_10x10_SRGB_BLOCK;     // 4-component ASTC, 10x10 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:         return VK_FORMAT_ASTC_12x10_SRGB_BLOCK;     // 4-component ASTC, 12x10 blocks, sRGB
+        case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:         return VK_FORMAT_ASTC_12x12_SRGB_BLOCK;     // 4-component ASTC, 12x12 blocks, sRGB
+
+        //
+        // Depth/stencil
+        //
+        case GL_DEPTH_COMPONENT16:                              return VK_FORMAT_D16_UNORM;
+        case GL_DEPTH_COMPONENT24:                              return VK_FORMAT_X8_D24_UNORM_PACK32;
+//        case GL_DEPTH_COMPONENT32:                              return VK_FORMAT_UNDEFINED;
+        case GL_DEPTH_COMPONENT32F:                             return VK_FORMAT_D32_SFLOAT;
+#ifdef GL_DEPTH_COMPONENT32F_NV
+        case GL_DEPTH_COMPONENT32F_NV:                          return VK_FORMAT_D32_SFLOAT;
+#endif
+//        case GL_STENCIL_INDEX1:                                 return VK_FORMAT_UNDEFINED;
+//        case GL_STENCIL_INDEX4:                                 return VK_FORMAT_UNDEFINED;
+        case GL_STENCIL_INDEX8:                                 return VK_FORMAT_S8_UINT;
+//        case GL_STENCIL_INDEX16:                                return VK_FORMAT_UNDEFINED;
+        case GL_DEPTH24_STENCIL8:                               return VK_FORMAT_D24_UNORM_S8_UINT;
+        case GL_DEPTH32F_STENCIL8:                              return VK_FORMAT_D32_SFLOAT_S8_UINT;
+#ifdef GL_DEPTH32F_STENCIL8_NV
+        case GL_DEPTH32F_STENCIL8_NV:                           return VK_FORMAT_D32_SFLOAT_S8_UINT;
+#endif
+        default:                                                return VK_FORMAT_UNDEFINED;
+    }
+}
+
+#endif // !VK_FORMAT_H
diff --git a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h
index 7439087d8..719dad9ed 100644
--- a/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h
+++ b/src/client/hardwareintegration/qwaylandserverbufferintegration_p.h
@@ -70,7 +70,8 @@ class Q_WAYLAND_CLIENT_EXPORT QWaylandServerBuffer
 public:
     enum Format {
         RGBA32,
-        A8
+        A8,
+        Custom
     };
 
     QWaylandServerBuffer();
diff --git a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
index 7d8901d58..16e08a8ea 100644
--- a/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
+++ b/src/compositor/hardware_integration/qwlserverbufferintegration_p.h
@@ -75,7 +75,8 @@ class Q_WAYLAND_COMPOSITOR_EXPORT ServerBuffer
 public:
     enum Format {
         RGBA32,
-        A8
+        A8,
+        Custom
     };
 
     ServerBuffer(const QSize &size, ServerBuffer::Format format);
@@ -105,6 +106,13 @@ public:
 
     virtual bool supportsFormat(ServerBuffer::Format format) const = 0;
     virtual ServerBuffer *createServerBufferFromImage(const QImage &qimage, ServerBuffer::Format format) = 0;
+    virtual ServerBuffer *createServerBufferFromData(const QByteArray &data, const QSize &size, uint glInternalFormat)
+    {
+        Q_UNUSED(data);
+        Q_UNUSED(size);
+        Q_UNUSED(glInternalFormat);
+        return nullptr;
+    }
 };
 
 }
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri b/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri
index 9e1b1ff0c..b86f8453a 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri
@@ -1,4 +1,4 @@
-INCLUDEPATH += $$PWD
+INCLUDEPATH += $$PWD $$PWD/../../../3rdparty/util
 
 QMAKE_USE_PRIVATE += wayland-server
 
@@ -6,10 +6,10 @@ SOURCES += \
     $$PWD/vulkanserverbufferintegration.cpp \
     $$PWD/vulkanwrapper.cpp
 
-
 HEADERS += \
     $$PWD/vulkanserverbufferintegration.h \
-    $$PWD/vulkanwrapper.h
+    $$PWD/vulkanwrapper.h \
+    $$PWD/vk_format.h
 
 CONFIG += wayland-scanner
 WAYLANDSERVERSOURCES += $$PWD/../../../extensions/qt-vulkan-server-buffer-unstable-v1.xml
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp
index 5d63a64d4..0d60a9824 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.cpp
@@ -43,12 +43,15 @@
 
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLTexture>
-#include <QOffscreenSurface>
+#include <QtGui/QOffscreenSurface>
+#include <QtGui/qopengl.h>
 
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
+static constexpr bool extraDebug = false;
+
 VulkanServerBuffer::VulkanServerBuffer(VulkanServerBufferIntegration *integration, const QImage &qimage, QtWayland::ServerBuffer::Format format)
     : QtWayland::ServerBuffer(qimage.size(),format)
     , m_integration(integration)
@@ -75,6 +78,18 @@ VulkanServerBuffer::VulkanServerBuffer(VulkanServerBufferIntegration *integratio
         m_fd = vulkanWrapper->getImageInfo(m_vImage, &m_memorySize);
 }
 
+VulkanServerBuffer::VulkanServerBuffer(VulkanServerBufferIntegration *integration, VulkanImageWrapper *vImage, uint glInternalFormat, const QSize &size)
+    : QtWayland::ServerBuffer(size, QtWayland::ServerBuffer::Custom)
+    , m_integration(integration)
+    , m_width(size.width())
+    , m_height(size.height())
+    , m_vImage(vImage)
+    , m_glInternalFormat(glInternalFormat)
+{
+    auto vulkanWrapper = m_integration->vulkanWrapper();
+    m_fd = vulkanWrapper->getImageInfo(m_vImage, &m_memorySize);
+}
+
 VulkanServerBuffer::~VulkanServerBuffer()
 {
     delete m_texture; //this is always nullptr for now
@@ -140,7 +155,7 @@ bool VulkanServerBufferIntegration::supportsFormat(QtWayland::ServerBuffer::Form
         case QtWayland::ServerBuffer::RGBA32:
             return true;
         case QtWayland::ServerBuffer::A8:
-            return false; // TODO: add more formats
+            return false;
         default:
             return false;
     }
@@ -190,4 +205,20 @@ QtWayland::ServerBuffer *VulkanServerBufferIntegration::createServerBufferFromIm
     return new VulkanServerBuffer(this, qimage, format);
 }
 
+QtWayland::ServerBuffer *VulkanServerBufferIntegration::createServerBufferFromData(const QByteArray &data, const QSize &size, uint glInternalFormat)
+{
+    if (!m_vulkanWrapper) {
+        CurrentContext current;
+        m_vulkanWrapper = new VulkanWrapper(current.context());
+    }
+
+    auto *vImage = m_vulkanWrapper->createTextureImageFromData(reinterpret_cast<const uchar*>(data.constData()), data.size(), size, glInternalFormat);
+
+    if (vImage)
+        return new VulkanServerBuffer(this, vImage, glInternalFormat, size);
+
+    qCWarning(qLcWaylandCompositorHardwareIntegration) << "could not load compressed texture";
+    return nullptr;
+}
+
 QT_END_NAMESPACE
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h
index aa1074ec6..8e7a3fe64 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkanserverbufferintegration.h
@@ -62,6 +62,7 @@ class VulkanServerBuffer : public QtWayland::ServerBuffer, public QtWaylandServe
 {
 public:
     VulkanServerBuffer(VulkanServerBufferIntegration *integration, const QImage &qimage, QtWayland::ServerBuffer::Format format);
+    VulkanServerBuffer(VulkanServerBufferIntegration *integration, VulkanImageWrapper *vImage, uint glInternalFormat, const QSize &size);
     ~VulkanServerBuffer() override;
 
     struct ::wl_resource *resourceForClient(struct ::wl_client *) override;
@@ -97,6 +98,8 @@ public:
 
     bool supportsFormat(QtWayland::ServerBuffer::Format format) const override;
     QtWayland::ServerBuffer *createServerBufferFromImage(const QImage &qimage, QtWayland::ServerBuffer::Format format) override;
+    QtWayland::ServerBuffer *createServerBufferFromData(const QByteArray &data, const QSize &size, uint glInternalFormat) override;
+
 private:
     VulkanWrapper *m_vulkanWrapper = nullptr;
 };
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
index 18cdaf8a6..4767733dc 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
@@ -51,6 +51,7 @@
 #include <set>
 
 #include <unistd.h>
+#include "vk_format.h"
 
 #include <QDebug>
 
@@ -80,6 +81,8 @@ public:
     explicit VulkanWrapperPrivate(QOpenGLContext *glContext);
 
     VulkanImageWrapper *createTextureImage(const QImage &img);
+    VulkanImageWrapper *createTextureImageFromData(const uchar *pixels, uint bufferSize, const QSize &size, VkFormat vkFormat);
+
     void freeTextureImage(VulkanImageWrapper *imageWrapper);
 
 private:
@@ -160,6 +163,7 @@ private:
     }
 
     int findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties);
+
     VulkanImageWrapper *createImage(VkFormat format, VkImageTiling tiling, VkImageUsageFlags usage, VkMemoryPropertyFlags properties, const QSize &size, int memSize);
     bool transitionImageLayout(VkImage image, VkFormat /*format*/, VkImageLayout oldLayout, VkImageLayout newLayout);
     bool createBuffer(VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags properties, VkBuffer& buffer, VkDeviceMemory& bufferMemory);
@@ -501,14 +505,17 @@ bool VulkanWrapperPrivate::createLogicalDevice()
 
 VulkanImageWrapper *VulkanWrapperPrivate::createTextureImage(const QImage &img)
 {
+    return createTextureImageFromData(img.constBits(), img.sizeInBytes(), img.size(), VK_FORMAT_R8G8B8A8_UNORM);
+}
+
+VulkanImageWrapper *VulkanWrapperPrivate::createTextureImageFromData(const uchar *pixels, uint bufferSize, const QSize &size, VkFormat vkFormat)
+{
     if (m_initFailed)
         return nullptr;
 
-    int texWidth = img.width();
-    int texHeight = img.height();
+    int texWidth = size.width();
+    int texHeight = size.height();
     bool ok;
-    const auto *pixels = img.constBits();
-    VkDeviceSize imageSize = img.sizeInBytes();
     if (extraDebug) qDebug("image load %p %dx%d", pixels, texWidth, texHeight);
     if (!pixels) {
         qCritical("VulkanWrapper: failed to load texture image!");
@@ -517,20 +524,20 @@ VulkanImageWrapper *VulkanWrapperPrivate::createTextureImage(const QImage &img)
 
     VkBuffer stagingBuffer;
     VkDeviceMemory stagingBufferMemory;
-    ok = createBuffer(imageSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, stagingBuffer, stagingBufferMemory);
+    ok = createBuffer(bufferSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, stagingBuffer, stagingBufferMemory);
 
     if (!ok)
         return nullptr;
 
     void* data;
-    vkMapMemory(m_device, stagingBufferMemory, 0, imageSize, 0, &data);
-    if (extraDebug) qDebug() << "mapped" << data << imageSize;
-    memcpy(data, pixels, static_cast<size_t>(imageSize));
+    vkMapMemory(m_device, stagingBufferMemory, 0, bufferSize, 0, &data);
+    if (extraDebug) qDebug() << "mapped" << data << bufferSize;
+    memcpy(data, pixels, static_cast<size_t>(bufferSize));
     vkUnmapMemory(m_device, stagingBufferMemory);
 
     if (extraDebug) qDebug() << "creating image...";
 
-    QScopedPointer<VulkanImageWrapper> imageWrapper(createImage(VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, img.size(), imageSize));
+    QScopedPointer<VulkanImageWrapper> imageWrapper(createImage(vkFormat, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, size, bufferSize));
     if (imageWrapper.isNull())
         return nullptr;
 
@@ -538,14 +545,14 @@ VulkanImageWrapper *VulkanWrapperPrivate::createTextureImage(const QImage &img)
 
     const VkImage textureImage = imageWrapper->textureImage;
 
-    ok = transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+    ok = transitionImageLayout(textureImage, vkFormat, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
 
     if (!ok)
         return nullptr;
 
     if (extraDebug) qDebug() << "copyBufferToImage...";
     copyBufferToImage(stagingBuffer, textureImage, static_cast<uint32_t>(texWidth), static_cast<uint32_t>(texHeight));
-    transitionImageLayout(textureImage, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+    transitionImageLayout(textureImage, vkFormat, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 
     vkDestroyBuffer(m_device, stagingBuffer, nullptr);
     vkFreeMemory(m_device, stagingBufferMemory, nullptr);
@@ -674,8 +681,7 @@ VulkanWrapperPrivate::VulkanWrapperPrivate(QOpenGLContext *glContext)
 #ifdef VULKAN_SERVER_BUFFER_EXTRA_DEBUG
     qDebug() << "GPU memory type:" << gpuMemoryType << "heap:" << memProps.memoryTypes[gpuMemoryType].heapIndex;
 
-//  for (int f = 0; f <= VK_FORMAT_A8B8G8R8_SRGB_PACK32; f++)
-    int f = VK_FORMAT_R8G8B8A8_UNORM;
+    for (int f = 0; f <= VK_FORMAT_ASTC_12x12_SRGB_BLOCK; f++)
     {
         VkFormatProperties formatProps;
         vkGetPhysicalDeviceFormatProperties(dev[0], VkFormat(f), &formatProps);
@@ -696,6 +702,15 @@ VulkanImageWrapper *VulkanWrapper::createTextureImage(const QImage &img)
     return d_ptr->createTextureImage(img);
 }
 
+VulkanImageWrapper *VulkanWrapper::createTextureImageFromData(const uchar *pixels, uint bufferSize, const QSize &size, uint glInternalFormat)
+{
+    VkFormat vkFormat = VkFormat(vkGetFormatFromOpenGLInternalFormat(glInternalFormat));
+    if (vkFormat == VK_FORMAT_UNDEFINED)
+        return nullptr;
+
+    return d_ptr->createTextureImageFromData(pixels, bufferSize, size, vkFormat);
+}
+
 int VulkanWrapper::getImageInfo(const VulkanImageWrapper *imgWrapper, int *memSize, int *w, int *h)
 {
     if (memSize)
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h
index 697729bf5..541618fb3 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.h
@@ -57,6 +57,7 @@ public:
     VulkanWrapper(QOpenGLContext *glContext);
 
     VulkanImageWrapper *createTextureImage(const QImage &img);
+    VulkanImageWrapper *createTextureImageFromData(const uchar *pixels, uint bufferSize, const QSize &size, uint glInternalFormat);
     int getImageInfo(const VulkanImageWrapper *imgWrapper, int *memSize, int *w = nullptr, int *h = nullptr);
     void freeTextureImage(VulkanImageWrapper *imageWrapper);