alpqr

diff --git a/qcpainter/libqcpainter/cmake/shadercompiler.cmake b/qcpainter/libqcpainter/cmake/shadercompiler.cmake
index 28159ac..43b0bed 100644
--- a/qcpainter/libqcpainter/cmake/shadercompiler.cmake
+++ b/qcpainter/libqcpainter/cmake/shadercompiler.cmake
@@ -27,6 +27,7 @@ function (process)
     file(READ "${SHADER_INCLUDE_DIR}/customvert.glsl" LIB_CUSTOM_VERT)
 
     set(RET_STR "")
+    set(ORIG_RET_STR "")
 

alpqr

From 43756306ed47be5c56c5305e75a78a7e769a223a Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@qt.io>
Date: Mon, 17 Jun 2024 15:54:45 +0200
Subject: [PATCH] WIP: test

Change-Id: I2decbcefe037a29f26522c3234b2c4c3ee241a9f
---
 src/quick/scenegraph/util/qsgrhiatlastexture.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

alpqr

diff --git a/VR_Room/VRRoom/Main.qml b/VR_Room/VRRoom/Main.qml
index 07a9645..a64d8f3 100644
--- a/VR_Room/VRRoom/Main.qml
+++ b/VR_Room/VRRoom/Main.qml
@@ -15,6 +15,7 @@ XrView {
     referenceSpace: XrView.ReferenceSpaceStage

     enableDepthSubmission: true
+    enableMultiViewRendering: true

alpqr

class Renderer : public QQuickFramebufferObject::Renderer 
{
public:
    Renderer(const QQuickFramebufferObject *q) : q(q) { }

    void render() override {
        const float dpr = q->window()->effectiveDevicePixelRatio(); 
        QOpenGLPaintDevice dev((q->size() * dpr).toSize());
        dev.setDevicePixelRatio(dpr);
        QPainter p(&dev);

alpqr

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index 6d73606b4d..e53e1078e9 100644
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -47,6 +47,10 @@
 #include <QtWidgets/qgraphicsview.h>
 #endif

+#if QT_CONFIG(vulkan)
+#include <QtGui/private/qvulkandefaultinstance_p.h>

alpqr

cmake_minimum_required(VERSION 3.20)
project(testapp LANGUAGES CXX)

find_package(Qt6 COMPONENTS Core Gui Widgets ShaderTools)

qt_add_executable(testapp
    main.cpp
)

target_link_libraries(testapp PRIVATE

alpqr

Config: Using QtTest library 6.6.0, Qt 6.6.0 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 12.2.1 20221121 (Red Hat 12.2.1-4)), fedora 37
PASS   : tst_QRhi::initTestCase()
PASS   : tst_QRhi::tessellationInterfaceBlocks(Null)
QWARN  : tst_QRhi::tessellationInterfaceBlocks(OpenGL) Failed to compile shader: 0:9(3): error: redeclaration of gl_PerVertex must be a subset of the built-in members of gl_PerVertex
0:9(3): error: redeclaration of gl_PerVertex must be a subset of the built-in members of gl_PerVertex

Source was:
#version 320 es
layout(vertices = 3) out;

alpqr

class QSGAnimationDriver : public QAnimationDriver
{
public:
    QSGAnimationDriver(QObject *parent)
        : QAnimationDriver(parent)
    {
    }
    void start() override
    {
        t.start();

alpqr

diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index d47203057f..c028c2c206 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -1312,6 +1312,8 @@ void QQuickShaderEffectPrivate::shaderCodePrepared(bool ok, QSGGuiThreadShaderEf
     }

     m_shaders[shaderType].hasShaderCode = true;
+    if (shaderInfoCache()->count() > 100)
+        shaderInfoCache()->clear();

alpqr

diff --git a/src/openglwidgets/qopenglwidget.cpp b/src/openglwidgets/qopenglwidget.cpp
index 3c5d9b72dc..2644741c0b 100644
--- a/src/openglwidgets/qopenglwidget.cpp
+++ b/src/openglwidgets/qopenglwidget.cpp
@@ -934,6 +934,8 @@ void QOpenGLWidgetPrivate::render()
     if (fakeHidden || !initialized)
         return;
 
+    setCurrentTargetBuffer(QOpenGLWidget::LeftBuffer);
+