Skip to content

Commit 73a15a8

Browse files
committed
fixes
- add workaround for flutter engine trying to resolve a vulkan function by the wrong name - `GetInstanceProcAddr` instead of `vkGetInstanceProcAddr` - properly initialize `drm_plane_transform_t` in `PLANE_TRANSFORM_...` macros
1 parent fd1d8d8 commit 73a15a8

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

include/modesetting.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ typedef struct {
183183
} drm_plane_transform_t;
184184

185185
#define PLANE_TRANSFORM_NONE ((const drm_plane_transform_t){ .u64 = 0 })
186-
#define PLANE_TRANSFORM_ROTATE_0 ((const drm_plane_transform_t){ .u32 = DRM_MODE_ROTATE_0 })
187-
#define PLANE_TRANSFORM_ROTATE_90 ((const drm_plane_transform_t){ .u32 = DRM_MODE_ROTATE_90 })
188-
#define PLANE_TRANSFORM_ROTATE_180 ((const drm_plane_transform_t){ .u32 = DRM_MODE_ROTATE_180 })
189-
#define PLANE_TRANSFORM_ROTATE_270 ((const drm_plane_transform_t){ .u32 = DRM_MODE_ROTATE_270 })
190-
#define PLANE_TRANSFORM_REFLECT_X ((const drm_plane_transform_t){ .u32 = DRM_MODE_REFLECT_X })
191-
#define PLANE_TRANSFORM_REFLECT_Y ((const drm_plane_transform_t){ .u32 = DRM_MODE_REFLECT_Y })
186+
#define PLANE_TRANSFORM_ROTATE_0 ((const drm_plane_transform_t){ .u64 = DRM_MODE_ROTATE_0 })
187+
#define PLANE_TRANSFORM_ROTATE_90 ((const drm_plane_transform_t){ .u64 = DRM_MODE_ROTATE_90 })
188+
#define PLANE_TRANSFORM_ROTATE_180 ((const drm_plane_transform_t){ .u64 = DRM_MODE_ROTATE_180 })
189+
#define PLANE_TRANSFORM_ROTATE_270 ((const drm_plane_transform_t){ .u64 = DRM_MODE_ROTATE_270 })
190+
#define PLANE_TRANSFORM_REFLECT_X ((const drm_plane_transform_t){ .u64 = DRM_MODE_REFLECT_X })
191+
#define PLANE_TRANSFORM_REFLECT_Y ((const drm_plane_transform_t){ .u64 = DRM_MODE_REFLECT_Y })
192192

193193
#define PLANE_TRANSFORM_IS_VALID(t) (((t).u64 & ~(DRM_MODE_ROTATE_MASK | DRM_MODE_REFLECT_MASK)) == 0)
194194
#define PLANE_TRANSFORM_IS_ONLY_ROTATION(t) (((t).u64 & ~DRM_MODE_ROTATE_MASK) == 0 && (HWEIGHT((t).u64) == 1))

src/flutter-pi.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,10 @@ MAYBE_UNUSED static void *on_get_vulkan_proc_address(
376376
(void) userdata;
377377

378378
#ifdef HAS_VULKAN
379+
if (streq(name, "GetInstanceProcAddr")) {
380+
name = "vkGetInstanceProcAddr";
381+
}
382+
379383
return (void*) vkGetInstanceProcAddr((VkInstance) instance, name);
380384
#else
381385
(void) userdata;

0 commit comments

Comments
 (0)