diff --git a/src/core/tls.cpp b/src/core/tls.cpp index f6df3a368..e0d7f3f89 100644 --- a/src/core/tls.cpp +++ b/src/core/tls.cpp @@ -119,16 +119,16 @@ void SetTcbBase(void* image_address) { // Create an LDT entry for the TCB. ldt_entry ldt{}; ldt.data = { + .limit00 = static_cast(ldt_block_size - 1), .base00 = static_cast(addr), .base16 = static_cast(addr >> 16), - .base24 = static_cast(addr >> 24), - .limit00 = static_cast(ldt_block_size - 1), - .limit16 = 0, .type = DESC_DATA_WRITE, .dpl = 3, // User accessible .present = 1, // Segment present + .limit16 = 0, .stksz = DESC_DATA_32B, .granular = DESC_GRAN_BYTE, + .base24 = static_cast(addr >> 24), }; int ret = i386_set_ldt(ldt_index, &ldt, 1); ASSERT_MSG(ret == ldt_index, diff --git a/src/video_core/renderer_vulkan/vk_platform.cpp b/src/video_core/renderer_vulkan/vk_platform.cpp index f1612000d..83bb3c6aa 100644 --- a/src/video_core/renderer_vulkan/vk_platform.cpp +++ b/src/video_core/renderer_vulkan/vk_platform.cpp @@ -419,14 +419,14 @@ vk::UniqueInstance CreateInstance(Frontend::WindowSystemType window_type, bool e vk::StructureChain instance_ci_chain = { vk::InstanceCreateInfo{ +#ifdef __APPLE__ + .flags = vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR, +#endif .pApplicationInfo = &application_info, .enabledLayerCount = static_cast(layers.size()), .ppEnabledLayerNames = layers.data(), .enabledExtensionCount = static_cast(extensions.size()), .ppEnabledExtensionNames = extensions.data(), -#ifdef __APPLE__ - .flags = vk::InstanceCreateFlagBits::eEnumeratePortabilityKHR, -#endif }, vk::LayerSettingsCreateInfoEXT{ .settingCount = layer_setings.size(),