rename MwWaylandAlwaysRender to MwWaylandVulkan
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
This commit is contained in:
parent
b8229c3ee8
commit
637015e4d5
4 changed files with 13 additions and 6 deletions
|
|
@ -144,7 +144,12 @@ typedef struct wayland_call_table {
|
||||||
} wayland_call_table_t;
|
} wayland_call_table_t;
|
||||||
|
|
||||||
extern wayland_call_table_t wl_call_tbl;
|
extern wayland_call_table_t wl_call_tbl;
|
||||||
extern MwBool MwWaylandAlwaysRender;
|
#ifdef MW_VULKAN
|
||||||
|
extern MwBool MwWaylandVulkan;
|
||||||
|
#else
|
||||||
|
#define MwWaylandVulkan 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/* defined inline right here so that it doesn't conflict with the other macros */
|
/* defined inline right here so that it doesn't conflict with the other macros */
|
||||||
MwInline int wayland_load_funcs() {
|
MwInline int wayland_load_funcs() {
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
|
|
|
||||||
|
|
@ -798,7 +798,7 @@ static void keyboard_key(void* data,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!MwWaylandAlwaysRender) {
|
if(!MwWaylandVulkan) {
|
||||||
MwLLDispatch(self, draw, NULL);
|
MwLLDispatch(self, draw, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,9 @@
|
||||||
#include "../../../external/stb_ds.h"
|
#include "../../../external/stb_ds.h"
|
||||||
|
|
||||||
wayland_call_table_t wl_call_tbl;
|
wayland_call_table_t wl_call_tbl;
|
||||||
MwBool MwWaylandAlwaysRender = MwFALSE;
|
#ifdef MW_VULKAN
|
||||||
|
MwBool MwWaylandVulkan = MwFALSE;
|
||||||
|
#endif
|
||||||
|
|
||||||
static pthread_mutex_t destroyedWidgetsTableMutex;
|
static pthread_mutex_t destroyedWidgetsTableMutex;
|
||||||
/*
|
/*
|
||||||
|
|
@ -1100,7 +1102,7 @@ static int MwLLPendingImpl(MwLL handle) {
|
||||||
handle->wayland.did_initial_resize = 1;
|
handle->wayland.did_initial_resize = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!MwWaylandAlwaysRender) {
|
if(!MwWaylandVulkan) {
|
||||||
wl_display_prepare_read(handle->wayland.display);
|
wl_display_prepare_read(handle->wayland.display);
|
||||||
if(!poll(&fd, 1, timeout.tv_nsec)) {
|
if(!poll(&fd, 1, timeout.tv_nsec)) {
|
||||||
wl_display_cancel_read(handle->wayland.display);
|
wl_display_cancel_read(handle->wayland.display);
|
||||||
|
|
@ -1127,7 +1129,7 @@ static int MwLLPendingImpl(MwLL handle) {
|
||||||
|
|
||||||
static void MwLLNextEventImpl(MwLL handle) {
|
static void MwLLNextEventImpl(MwLL handle) {
|
||||||
WIDGET_CHECK(handle);
|
WIDGET_CHECK(handle);
|
||||||
if(!MwWaylandAlwaysRender) {
|
if(!MwWaylandVulkan) {
|
||||||
if(handle->wayland.did_event_loop_early) {
|
if(handle->wayland.did_event_loop_early) {
|
||||||
handle->wayland.did_event_loop_early = MwFALSE;
|
handle->wayland.did_event_loop_early = MwFALSE;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -242,7 +242,7 @@ static int vulkan_instance_setup(MwWidget handle, vulkan_t* o) {
|
||||||
if(handle->lowlevel->common.type == MwLLBackendWayland) {
|
if(handle->lowlevel->common.type == MwLLBackendWayland) {
|
||||||
arrput(o->enabledExtensions, VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
|
arrput(o->enabledExtensions, VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
|
||||||
/* take this opprutunity to set the widget to always render */
|
/* take this opprutunity to set the widget to always render */
|
||||||
MwWaylandAlwaysRender = MwTRUE;
|
MwWaylandVulkan = MwTRUE;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_COCOA
|
#ifdef USE_COCOA
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue