From f22a3f9ec61b4d422d889fd89a712692b04fd797 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gmail.com>
Date: Tue, 16 Jan 2024 00:45:00 +0000
Subject: [PATCH] Revert "Merge branch 'demos-enable-vulkan' into 'main'"

This reverts merge request !6724
---
 build-aux/flatpak/org.gtk.Demo4.json           | 2 ++
 build-aux/flatpak/org.gtk.IconBrowser4.json    | 1 +
 build-aux/flatpak/org.gtk.WidgetFactory4.json  | 3 +++
 build-aux/flatpak/org.gtk.gtk4.NodeEditor.json | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json
index 21e4e1d467..5c75ece589 100644
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -185,6 +185,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
@@ -199,6 +200,7 @@
     ],
     "build-options" : {
         "env" : {
+            "GSK_RENDERER" : "opengl"
         }
     }
 }
diff --git a/build-aux/flatpak/org.gtk.IconBrowser4.json b/build-aux/flatpak/org.gtk.IconBrowser4.json
index 41a3ee68be..b563dbb285 100644
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -114,6 +114,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json
index fda1c61e6c..390da50cac 100644
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -114,6 +114,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
@@ -129,6 +130,8 @@
     "build-options" : {
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
+            "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }
diff --git a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
index c97f668fff..ef60c66084 100644
--- a/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
+++ b/build-aux/flatpak/org.gtk.gtk4.NodeEditor.json
@@ -114,6 +114,7 @@
             "builddir" : true,
             "config-opts" : [
                 "--libdir=/app/lib",
+                "-Dvulkan=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Ddemo-profile=devel"
             ],
@@ -129,6 +130,8 @@
     "build-options" : {
         "env" : {
             "DBUS_SESSION_BUS_ADDRESS" : "''",
+            "GSK_RENDERER" : "opengl",
+            "GDK_DEBUG" : "vulkan-disable",
             "G_ENABLE_DEBUG" : "true"
         }
     }