mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr-output-management: fix broken asserts

Browse source 
These asserts were broken in 4c1afb12 as new implementations were added
without updating the wl_resource_instance_of() calls.
This commit is contained in:
Isaac Freund 2022-08-25 00:51:32 +02:00
parent 4c1afb126b
commit d452a729cb
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
types/wlr_output_management_v1.c
View file

@ -18,20 +18,23 @@ enum {
static const uint32_t HEAD_STATE_ALL = HEAD_STATE_ENABLED | HEAD_STATE_MODE | static const uint32_t HEAD_STATE_ALL = HEAD_STATE_ENABLED | HEAD_STATE_MODE |
HEAD_STATE_POSITION | HEAD_STATE_TRANSFORM | HEAD_STATE_SCALE; HEAD_STATE_POSITION | HEAD_STATE_TRANSFORM | HEAD_STATE_SCALE;
static const struct zwlr_output_head_v1_interface head_impl;
// Can return NULL if the head is inert // Can return NULL if the head is inert
static struct wlr_output_head_v1 *head_from_resource( static struct wlr_output_head_v1 *head_from_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, assert(wl_resource_instance_of(resource,
&zwlr_output_head_v1_interface, NULL)); &zwlr_output_head_v1_interface, &head_impl));
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
} }
static const struct zwlr_output_mode_v1_interface output_mode_impl;
// Can return NULL if the mode is inert // Can return NULL if the mode is inert
static struct wlr_output_mode *mode_from_resource( static struct wlr_output_mode *mode_from_resource(
struct wl_resource *resource) { struct wl_resource *resource) {
assert(wl_resource_instance_of(resource, assert(wl_resource_instance_of(resource,
&zwlr_output_mode_v1_interface, NULL)); &zwlr_output_mode_v1_interface, &output_mode_impl));
return wl_resource_get_user_data(resource); return wl_resource_get_user_data(resource);
} }