Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-28 17:49:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "[vulkan, qcom] Re-ordering WMEL detection based for QCOM driver"

Browse source
This commit is contained in:
CamilleLaVey 2026-01-29 23:40:01 -04:00 • committed by Caio Oliveira
parent bb005df4a5
commit da77101b4d
No known key found for this signature in database
GPG key ID: AAAE6C7FD4186B0C
5 changed files with 17 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
View file

@ -621,21 +621,12 @@ void EmitContext::DefineSharedMemory(const IR::Program& program) {
AddExtension("SPV_KHR_workgroup_memory_explicit_layout"); AddExtension("SPV_KHR_workgroup_memory_explicit_layout");
AddCapability(spv::Capability::WorkgroupMemoryExplicitLayoutKHR); AddCapability(spv::Capability::WorkgroupMemoryExplicitLayoutKHR);
if (program.info.uses_int8) { if (program.info.uses_int8) {
if (profile.support_explicit_workgroup_layout8) { AddCapability(spv::Capability::WorkgroupMemoryExplicitLayout8BitAccessKHR);
AddCapability(spv::Capability::WorkgroupMemoryExplicitLayout8BitAccessKHR); std::tie(shared_memory_u8, shared_u8, std::ignore) = make(U8, 1);
std::tie(shared_memory_u8, shared_u8, std::ignore) = make(U8, 1);
} else {
// Driver doesn't report 8-bit access; do not emit 8-bit capability.
LOG_WARNING(Render_Vulkan, "SPIR-V: shader uses int8 but device lacks workgroupMemoryExplicitLayout8BitAccess; emitting fallback layout");
}
} }
if (program.info.uses_int16) { if (program.info.uses_int16) {
if (profile.support_explicit_workgroup_layout16) { AddCapability(spv::Capability::WorkgroupMemoryExplicitLayout16BitAccessKHR);
AddCapability(spv::Capability::WorkgroupMemoryExplicitLayout16BitAccessKHR); std::tie(shared_memory_u16, shared_u16, std::ignore) = make(U16, 2);
std::tie(shared_memory_u16, shared_u16, std::ignore) = make(U16, 2);
} else {
LOG_WARNING(Render_Vulkan, "SPIR-V: shader uses int16 but device lacks workgroupMemoryExplicitLayout16BitAccess; emitting fallback layout");
}
} }
if (program.info.uses_int64) { if (program.info.uses_int64) {
std::tie(shared_memory_u64, shared_u64, std::ignore) = make(U64, 8); std::tie(shared_memory_u64, shared_u64, std::ignore) = make(U64, 8);

6
src/shader_recompiler/profile.h
View file

@ -1,6 +1,3 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -29,9 +26,6 @@ struct Profile {
bool support_fp32_signed_zero_nan_preserve{}; bool support_fp32_signed_zero_nan_preserve{};
bool support_fp64_signed_zero_nan_preserve{}; bool support_fp64_signed_zero_nan_preserve{};
bool support_explicit_workgroup_layout{}; bool support_explicit_workgroup_layout{};
bool support_explicit_workgroup_layout8{};
bool support_explicit_workgroup_layout16{};
bool support_explicit_workgroup_layout_scalar{};
bool support_vote{}; bool support_vote{};
bool support_viewport_index_layer_non_geometry{}; bool support_viewport_index_layer_non_geometry{};
bool support_viewport_mask{}; bool support_viewport_mask{};

3
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
View file

@ -371,9 +371,6 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
.support_fp64_signed_zero_nan_preserve = .support_fp64_signed_zero_nan_preserve =
float_control.shaderSignedZeroInfNanPreserveFloat64 != VK_FALSE, float_control.shaderSignedZeroInfNanPreserveFloat64 != VK_FALSE,
.support_explicit_workgroup_layout = device.IsKhrWorkgroupMemoryExplicitLayoutSupported(), .support_explicit_workgroup_layout = device.IsKhrWorkgroupMemoryExplicitLayoutSupported(),
.support_explicit_workgroup_layout8 = device.IsKhrWorkgroupMemoryExplicitLayout8BitAccessSupported(),
.support_explicit_workgroup_layout16 = device.IsKhrWorkgroupMemoryExplicitLayout16BitAccessSupported(),
.support_explicit_workgroup_layout_scalar = device.IsKhrWorkgroupMemoryExplicitLayoutScalarBlockLayoutSupported(),
.support_vote = device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_VOTE_BIT), .support_vote = device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_VOTE_BIT),
.support_viewport_index_layer_non_geometry = .support_viewport_index_layer_non_geometry =
device.IsExtShaderViewportIndexLayerSupported(), device.IsExtShaderViewportIndexLayerSupported(),

67
src/video_core/vulkan_common/vulkan_device.cpp
View file

@ -549,6 +549,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
CollectToolingInfo(); CollectToolingInfo();
if (is_qualcomm) { if (is_qualcomm) {
// Qualcomm Adreno GPUs doesn't handle scaled vertex attributes; keep emulation enabled
must_emulate_scaled_formats = true; must_emulate_scaled_formats = true;
LOG_WARNING(Render_Vulkan, LOG_WARNING(Render_Vulkan,
"Qualcomm drivers require scaled vertex format emulation; forcing fallback"); "Qualcomm drivers require scaled vertex format emulation; forcing fallback");
@ -565,22 +566,9 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
sets_per_pool = 1024; sets_per_pool = 1024;
LOG_INFO(Render_Vulkan, "Qualcomm: forcing {} sets per pool", sets_per_pool); LOG_INFO(Render_Vulkan, "Qualcomm: forcing {} sets per pool", sets_per_pool);
const char* kShaderFloat16Int8 = VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME; has_broken_cube_compatibility = true;
const bool has_float16_int8_ext = supported_extensions.find(kShaderFloat16Int8) != LOG_WARNING(Render_Vulkan,
supported_extensions.end(); "Qualcomm: disabling VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT due to driver bugs");
if (has_float16_int8_ext) {
loaded_extensions.insert(std::string(kShaderFloat16Int8));
extensions.shader_float16_int8 = true;
LOG_INFO(Render_Vulkan, "Qualcomm: VK_KHR_shader_float16_int8 available");
} else {
extensions.shader_float16_int8 = false;
LOG_INFO(Render_Vulkan, "Qualcomm: VK_KHR_shader_float16_int8 not available");
}
const int drv_sf16 = features.shader_float16_int8.shaderFloat16 ? 1 : 0;
const int drv_si8 = features.shader_float16_int8.shaderInt8 ? 1 : 0;
const int drv_si16 = features.features.shaderInt16 ? 1 : 0;
LOG_INFO(Render_Vulkan, "Qualcomm: shaderFloat16={} shaderInt8={} shaderInt16={}", drv_sf16, drv_si8, drv_si16);
#if defined(ANDROID) && defined(ARCHITECTURE_arm64) #if defined(ANDROID) && defined(ARCHITECTURE_arm64)
// BCn patching only safe on Android 9+ (API 28+). Older versions crash on driver load. // BCn patching only safe on Android 9+ (API 28+). Older versions crash on driver load.
@ -1511,44 +1499,15 @@ void Device::RemoveUnsuitableExtensions() {
} }
// VK_KHR_workgroup_memory_explicit_layout // VK_KHR_workgroup_memory_explicit_layout
const bool base = features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout; extensions.workgroup_memory_explicit_layout =
const bool has8 = features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout8BitAccess; features.features.shaderInt16 &&
const bool has16 = features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout16BitAccess; features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout &&
const bool hasScalar = features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayoutScalarBlockLayout; features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout8BitAccess &&
features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout16BitAccess &&
const bool is_qualcomm = properties.driver.driverID == VK_DRIVER_ID_QUALCOMM_PROPRIETARY; features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayoutScalarBlockLayout;
RemoveExtensionFeatureIfUnsuitable(extensions.workgroup_memory_explicit_layout,
if (is_qualcomm) { features.workgroup_memory_explicit_layout,
extensions.workgroup_memory_explicit_layout = VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME);
features.features.shaderInt16 && base && (has16 || hasScalar || has8);
if (extensions.workgroup_memory_explicit_layout && !(has8 && has16 && hasScalar)) {
LOG_INFO(Render_Vulkan,
"Qualcomm: enabling partial VK_KHR_workgroup_memory_explicit_layout (8bit={},16bit={},scalar={})",
has8, has16, hasScalar);
}
// If the extension is supported by the driver, ensure it's requested when we enable it.
if (extensions.workgroup_memory_explicit_layout) {
const char* kWgMemExt = VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME;
if (supported_extensions.find(kWgMemExt) != supported_extensions.end()) {
if (loaded_extensions.find(std::string(kWgMemExt)) == loaded_extensions.end()) {
loaded_extensions.insert(std::string(kWgMemExt));
LOG_INFO(Render_Vulkan, "Qualcomm: added {} to loaded_extensions", kWgMemExt);
}
} else {
LOG_INFO(Render_Vulkan,
"Qualcomm: driver reports explicit-layout subfeatures but does not advertise {}",
VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME);
}
}
} else {
extensions.workgroup_memory_explicit_layout =
features.features.shaderInt16 && base && has8 && has16 && hasScalar;
}
RemoveExtensionFeatureIfUnsuitable(extensions.workgroup_memory_explicit_layout,
features.workgroup_memory_explicit_layout,
VK_KHR_WORKGROUP_MEMORY_EXPLICIT_LAYOUT_EXTENSION_NAME);
}
// VK_EXT_swapchain_maintenance1 (extension only, has features) // VK_EXT_swapchain_maintenance1 (extension only, has features)
// Requires VK_EXT_surface_maintenance1 instance extension // Requires VK_EXT_surface_maintenance1 instance extension

12
src/video_core/vulkan_common/vulkan_device.h
View file

@ -493,18 +493,6 @@ public:
return extensions.workgroup_memory_explicit_layout; return extensions.workgroup_memory_explicit_layout;
} }
bool IsKhrWorkgroupMemoryExplicitLayout8BitAccessSupported() const {
return features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout8BitAccess;
}
bool IsKhrWorkgroupMemoryExplicitLayout16BitAccessSupported() const {
return features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout16BitAccess;
}
bool IsKhrWorkgroupMemoryExplicitLayoutScalarBlockLayoutSupported() const {
return features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayoutScalarBlockLayout;
}
/// Returns true if the device supports VK_KHR_image_format_list. /// Returns true if the device supports VK_KHR_image_format_list.
bool IsKhrImageFormatListSupported() const { bool IsKhrImageFormatListSupported() const {
return extensions.image_format_list || instance_version >= VK_API_VERSION_1_2; return extensions.image_format_list || instance_version >= VK_API_VERSION_1_2;