From e0c554976ac9078d4cff78cb1adc1b609e5fe2c9 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 22 Oct 2025 06:42:01 +0200 Subject: [PATCH] [video_core] fix compilation errors from bad merge, fix string_view UB (#2812) - fixes string_view corruption - fixes the latest master Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2812 Reviewed-by: Maufeat Co-authored-by: lizzie Co-committed-by: lizzie --- .../maxwell/translate/impl/surface_atomic_operations.cpp | 4 ++-- src/video_core/renderer_opengl/gl_device.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/surface_atomic_operations.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/surface_atomic_operations.cpp index c1f50ad979..6f70ccc7c0 100644 --- a/src/shader_recompiler/frontend/maxwell/translate/impl/surface_atomic_operations.cpp +++ b/src/shader_recompiler/frontend/maxwell/translate/impl/surface_atomic_operations.cpp @@ -78,11 +78,11 @@ IR::Value MakeCoords(TranslatorVisitor& v, IR::Reg reg, Type type) { case Type::_1D: case Type::_1D_BUFFER: return v.X(reg); - case Type::ARRAY_1D: + case Type::_1D_ARRAY: return v.ir.CompositeConstruct(v.X(reg), array(1)); case Type::_2D: return v.ir.CompositeConstruct(v.X(reg), v.X(reg + 1)); - case Type::ARRAY_2D: + case Type::_2D_ARRAY: return v.ir.CompositeConstruct(v.X(reg), v.X(reg + 1), array(2)); case Type::_3D: return v.ir.CompositeConstruct(v.X(reg), v.X(reg + 1), v.X(reg + 2)); diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index 8b10747b9a..9fe0bcb1d3 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp @@ -243,7 +243,7 @@ Device::Device(Core::Frontend::EmuWindow& emu_window) { } if (shader_backend == Settings::ShaderBackend::Glsl && is_nvidia) { - const std::string_view driver_version = version.substr(13); + const std::string driver_version = version.substr(13); const int version_major = std::atoi(driver_version.substr(0, driver_version.find(".")).data()); if (version_major >= 495) {