make sure to support wlroots-vkfx fork separately

ammen99 · ammen99 · commit ff6873999301 · 2026-03-14T16:33:48.000+01:00
diff --git a/config.h.in b/config.h.in
@@ -9,7 +9,7 @@
 #mesondefine BUILD_WITH_IMAGEIO
 #mesondefine USE_GLES32
 #mesondefine WF_HAS_XWAYLAND
-#mesondefine WF_HAS_VULKAN
+#mesondefine WF_HAS_VULKANFX
 
 
 #endif /* end of include guard: CONFIG_H */
diff --git a/meson.build b/meson.build
@@ -45,8 +45,13 @@ libdl          = cpp.find_library('dl')
 udev           = dependency('libudev')
 json           = subproject('wf-json', default_options: ['install_header=true']).get_variable('wfjson')
 
-wlroots_base_version = '0.19'
-wlroots_dep_name = 'wlroots-' + wlroots_base_version
+wlroots_base_version = '0.20'
+if get_option('vulkan_effects')
+  wlroots_dep_name = 'wlroots-vkfx-' + wlroots_base_version
+else
+  wlroots_dep_name = 'wlroots-' + wlroots_base_version
+endif
+
 wlroots_min_version = '>=' + wlroots_base_version + '.0'
 wlroots_max_version = '<=' + wlroots_base_version + '.99'
 
@@ -60,7 +65,6 @@ elif get_option('use_system_wlroots').enabled()
 	wlroots = dependency(wlroots_dep_name, version: [wlroots_min_version, wlroots_max_version], required: true)
 
 elif get_option('use_system_wlroots').auto()
-	message( 'SEARCHING FOR WLROOTS' )
 	wlroots = dependency(wlroots_dep_name, version: [wlroots_min_version, wlroots_max_version], required: false)
 	use_system_wlroots = true
 	if not wlroots.found()
@@ -195,12 +199,11 @@ else
 endif
 
 
-use_vulkan = vulkan.found() and wlroots_features['vulkan_renderer'] and not get_option('vulkan_effects').disabled()
-conf_data.set('WF_SHADER_DIR', join_paths(get_option('prefix'), 'share', 'wayfire', 'shaders'))
+use_vulkan = vulkan.found() and wlroots_features['vulkan_renderer'] and get_option('vulkan_effects')
 if use_vulkan
-  conf_data.set('WF_HAS_VULKAN', 1)
+  conf_data.set('WF_HAS_VULKANFX', 1)
 else
-  conf_data.set('WF_HAS_VULKAN', 0)
+  conf_data.set('WF_HAS_VULKANFX', 0)
 endif
 
 wayfire_conf_inc = include_directories(['.'])
@@ -278,6 +281,7 @@ summary = [
     '    x11-backend: @0@'.format(wlroots_features['x11_backend']),
     '        imageio: @0@'.format(conf_data.get('BUILD_WITH_IMAGEIO')),
     '         gles32: @0@'.format(conf_data.get('USE_GLES32')),
+    ' vulkan effects: @0@'.format(conf_data.get('WF_HAS_VULKANFX')),
     '    print trace: @0@'.format(print_trace),
     '     unit tests: @0@'.format(doctest.found()),
     '----------------',
diff --git a/meson_options.txt b/meson_options.txt
@@ -8,4 +8,4 @@ option('print_trace', type: 'boolean', value: true, description: 'Print stack tr
 option('tests', type: 'feature', value: 'auto', description: 'Enable unit tests')
 option('custom_pch', type: 'boolean', value: false, description: 'Use custom PCH for plugins. May not work with all compilers and setups.')
 option('build_locales', type: 'feature', value: 'auto', description: 'Build supported locale translations')
-option('vulkan_effects', type: 'feature', value: 'auto', description: 'Build supported Vulkan effects')
+option('vulkan_effects', type: 'boolean', value: false, description: 'Build with custom Vulkan effects')
diff --git a/plugins/protocols/input-method-v1.cpp b/plugins/protocols/input-method-v1.cpp
@@ -527,7 +527,7 @@ class wayfire_input_method_v1 : public wf::plugin_interface_t, public wf::text_i
         if (enable_text_input_v3)
         {
             wf::get_core().protocols.text_input = wlr_text_input_manager_v3_create(wf::get_core().display);
-            on_text_input_v3_created.connect(&wf::get_core().protocols.text_input->events.text_input);
+            on_text_input_v3_created.connect(&wf::get_core().protocols.text_input->events.new_text_input);
             on_text_input_v3_created.set_callback([&] (void *data)
             {
                 handle_text_input_v3_created(static_cast<wlr_text_input_v3*>(data));
diff --git a/plugins/wobbly/wobbly.cpp b/plugins/wobbly/wobbly.cpp
@@ -889,6 +889,7 @@ class wobbly_render_instance_t :
         damage |= self->get_bounding_box();
     }
 
+#if WF_HAS_VULKANFX
     class vulkan_state_t : public wf::custom_data_t
     {
       public:
@@ -959,7 +960,6 @@ class wobbly_render_instance_t :
             // Try to reuse the vertex buffer if possible, to avoid reallocations.
             if (buffer && (buffer->get_size() >= total_size) && (buffer.use_count() == 1))
             {
-                // LOGI("Reuse buffer index ", i);
                 return buffers[i];
             }
         }
@@ -969,6 +969,8 @@ class wobbly_render_instance_t :
         return buffers[0];
     }
 
+#endif
+
     void render(const wf::scene::render_instruction_t& data) override
     {
         std::vector<float> vert, uv;
@@ -989,6 +991,7 @@ class wobbly_render_instance_t :
             }
         });
 
+#if WF_HAS_VULKANFX
         data.pass->custom_vulkan_subpass([&] (wf::vulkan_render_state_t& state,
                                               wf::vk::command_buffer_t& cmd_buf)
         {
@@ -1033,6 +1036,7 @@ class wobbly_render_instance_t :
                 vkCmdDraw(cmd_buf, count_triangles * 3, 1, 0, 0);
             });
         });
+#endif
     }
 };
 
diff --git a/src/api/wayfire/nonstd/wlroots-full.hpp b/src/api/wayfire/nonstd/wlroots-full.hpp
@@ -36,7 +36,7 @@ extern "C"
     #include <wlr/render/gles2.h>
 #endif
 
-#if WF_HAS_VULKAN
+#if WLR_HAS_VULKAN_RENDERER
     #include <wlr/render/vulkan.h>
 #endif
 
diff --git a/src/api/wayfire/render.hpp b/src/api/wayfire/render.hpp
@@ -573,7 +573,7 @@ class render_pass_t
         return false;
     }
 
-#if WF_HAS_VULKAN
+#if WF_HAS_VULKANFX
     template<class F>
     bool custom_vulkan_subpass(F&& fn)
     {
@@ -591,7 +591,7 @@ class render_pass_t
 
   private:
 
-#if WF_HAS_VULKAN
+#if WF_HAS_VULKANFX
     vk::command_buffer_t *active_command_buffer = nullptr;
     vulkan_render_state_t *prepare_vulkan_subpass();
     void end_vulkan_subpass();
diff --git a/src/api/wayfire/vulkan.hpp b/src/api/wayfire/vulkan.hpp
@@ -6,7 +6,7 @@
     #include <wayfire/config.h>
 #endif
 
-#if WF_HAS_VULKAN
+#if WF_HAS_VULKANFX
     #include <memory>
     #include <map>
     #include <string>
diff --git a/src/core/core-impl.hpp b/src/core/core-impl.hpp
@@ -22,7 +22,7 @@ class compositor_core_impl_t : public compositor_core_t
     wlr_egl *egl = NULL;
     wlr_compositor *compositor;
 
-#if WF_HAS_VULKAN
+#if WF_HAS_VULKANFX
     std::unique_ptr<wf::vulkan_render_state_t> vulkan_state;
 #endif
 
diff --git a/src/core/core.cpp b/src/core/core.cpp
@@ -84,7 +84,7 @@ bool wf::compositor_core_t::is_gles2() const
 
 bool wf::compositor_core_t::is_vulkan() const
 {
-#if WF_HAS_VULKAN
+#if WLR_HAS_VULKAN_RENDERER
     return wlr_renderer_is_vk(renderer);
 #else
     return false;
@@ -251,7 +251,7 @@ void wf::compositor_core_impl_t::init()
         OpenGL::init();
     }
 
-#if WF_HAS_VULKAN
+#if WF_HAS_VULKANFX
     if (is_vulkan())
     {
         this->vulkan_state = std::make_unique<wf::vulkan_render_state_t>(renderer);
@@ -376,7 +376,7 @@ void wf::compositor_core_impl_t::fini()
     tx_manager.reset();
 
     OpenGL::fini();
-#if WF_HAS_VULKAN
+#if WF_HAS_VULKANFX
     vulkan_state.reset();
 #endif
 
diff --git a/src/core/seat/input-method-relay.cpp b/src/core/seat/input-method-relay.cpp
@@ -172,8 +172,8 @@ wf::input_method_relay::input_method_relay()
     auto& core = wf::get_core();
     if (core.protocols.text_input && core.protocols.input_method)
     {
-        on_text_input_new.connect(&wf::get_core().protocols.text_input->events.text_input);
-        on_input_method_new.connect(&wf::get_core().protocols.input_method->events.input_method);
+        on_text_input_new.connect(&wf::get_core().protocols.text_input->events.new_text_input);
+        on_input_method_new.connect(&wf::get_core().protocols.input_method->events.new_input_method);
         wf::get_core().connect(&keyboard_focus_changed);
     }
 }
diff --git a/src/render.cpp b/src/render.cpp
@@ -728,7 +728,7 @@ void wf::render_pass_t::finish_gles_subpass()
     GL_CALL(glDisable(GL_SCISSOR_TEST));
 }
 
-#if WF_HAS_VULKAN
+#if WF_HAS_VULKANFX
 wf::vulkan_render_state_t*wf::render_pass_t::prepare_vulkan_subpass()
 {
     if (!wlr_renderer_is_vk(this->get_wlr_renderer()))
diff --git a/src/view/view-3d.cpp b/src/view/view-3d.cpp
@@ -430,6 +430,7 @@ class view_3d_render_instance_t :
         transform_linear_damage(self.get(), damage);
     }
 
+#if WF_HAS_VULKANFX
     class vulkan_state_t : public wf::custom_data_t
     {
       public:
@@ -471,6 +472,8 @@ class view_3d_render_instance_t :
         return *ptr;
     }
 
+#endif
+
     void render(const wf::scene::render_instruction_t& data) override
     {
         auto bbox = self->get_children_bounding_box();
@@ -499,6 +502,7 @@ class view_3d_render_instance_t :
             }
         });
 
+#if WF_HAS_VULKANFX
         data.pass->custom_vulkan_subpass([&] (wf::vulkan_render_state_t& state, vk::command_buffer_t& cmd_buf)
         {
             auto& vk_state = ensure_vk(state);
@@ -523,6 +527,7 @@ class view_3d_render_instance_t :
                 vkCmdDraw(cmd_buf, 4, 1, 0, 0);
             });
         });
+#endif
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ class wayfire_input_method_v1 : public wf::plugin_interface_t, public wf::text_i`
`527`	`527`	`if (enable_text_input_v3)`
`528`	`528`	`{`
`529`	`529`	`wf::get_core().protocols.text_input = wlr_text_input_manager_v3_create(wf::get_core().display);`
`530`		`- on_text_input_v3_created.connect(&wf::get_core().protocols.text_input->events.text_input);`
	`530`	`+ on_text_input_v3_created.connect(&wf::get_core().protocols.text_input->events.new_text_input);`
`531`	`531`	`on_text_input_v3_created.set_callback([&] (void *data)`
`532`	`532`	`{`
`533`	`533`	`handle_text_input_v3_created(static_cast<wlr_text_input_v3*>(data));`
Original file line number	Diff line number	Diff line change
`@@ -889,6 +889,7 @@ class wobbly_render_instance_t :`
`889`	`889`	`damage \|= self->get_bounding_box();`
`890`	`890`	`}`
`891`	`891`
	`892`	`+#if WF_HAS_VULKANFX`
`892`	`893`	`class vulkan_state_t : public wf::custom_data_t`
`893`	`894`	`{`
`894`	`895`	`public:`
`@@ -959,7 +960,6 @@ class wobbly_render_instance_t :`
`959`	`960`	`// Try to reuse the vertex buffer if possible, to avoid reallocations.`
`960`	`961`	`if (buffer && (buffer->get_size() >= total_size) && (buffer.use_count() == 1))`
`961`	`962`	`{`
`962`		`- // LOGI("Reuse buffer index ", i);`
`963`	`963`	`return buffers[i];`
`964`	`964`	`}`
`965`	`965`	`}`
`@@ -969,6 +969,8 @@ class wobbly_render_instance_t :`
`969`	`969`	`return buffers[0];`
`970`	`970`	`}`
`971`	`971`
	`972`	`+#endif`
	`973`	`+`
`972`	`974`	`void render(const wf::scene::render_instruction_t& data) override`
`973`	`975`	`{`
`974`	`976`	`std::vector<float> vert, uv;`
`@@ -989,6 +991,7 @@ class wobbly_render_instance_t :`
`989`	`991`	`}`
`990`	`992`	`});`
`991`	`993`
	`994`	`+#if WF_HAS_VULKANFX`
`992`	`995`	`data.pass->custom_vulkan_subpass([&] (wf::vulkan_render_state_t& state,`
`993`	`996`	`wf::vk::command_buffer_t& cmd_buf)`
`994`	`997`	`{`
`@@ -1033,6 +1036,7 @@ class wobbly_render_instance_t :`
`1033`	`1036`	`vkCmdDraw(cmd_buf, count_triangles * 3, 1, 0, 0);`
`1034`	`1037`	`});`
`1035`	`1038`	`});`
	`1039`	`+#endif`
`1036`	`1040`	`}`
`1037`	`1041`	`};`
`1038`	`1042`
Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ class render_pass_t`
`573`	`573`	`return false;`
`574`	`574`	`}`
`575`	`575`
`576`		`-#if WF_HAS_VULKAN`
	`576`	`+#if WF_HAS_VULKANFX`
`577`	`577`	`template<class F>`
`578`	`578`	`bool custom_vulkan_subpass(F&& fn)`
`579`	`579`	`{`
`@@ -591,7 +591,7 @@ class render_pass_t`
`591`	`591`
`592`	`592`	`private:`
`593`	`593`
`594`		`-#if WF_HAS_VULKAN`
	`594`	`+#if WF_HAS_VULKANFX`
`595`	`595`	`vk::command_buffer_t *active_command_buffer = nullptr;`
`596`	`596`	`vulkan_render_state_t *prepare_vulkan_subpass();`
`597`	`597`	`void end_vulkan_subpass();`