diff --git a/src/common/settings.h b/src/common/settings.h index 59e75d3ee0..891bde608c 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -320,19 +320,11 @@ struct Values { linkage, true, "cpuopt_unsafe_ignore_global_monitor", Category::CpuUnsafe}; // Renderer - SwitchableSetting renderer_backend{linkage, -#if defined(__sun__) || defined(__managarm__) - RendererBackend::OpenGL, -#else - RendererBackend::Vulkan, -#endif + SwitchableSetting renderer_backend{ + linkage, RendererBackend::Vulkan, "backend", Category::Renderer}; - SwitchableSetting shader_backend{linkage, -#if defined(__sun__) || defined(__managarm__) - ShaderBackend::Glsl, -#else - ShaderBackend::SpirV, -#endif + SwitchableSetting shader_backend{ + linkage, ShaderBackend::SpirV, "shader_backend", Category::Renderer, Specialization::RuntimeList}; SwitchableSetting vulkan_device{linkage, 0, "vulkan_device", Category::Renderer, Specialization::RuntimeList}; diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp index 52ca9bbdb6..1a8a7c8dce 100644 --- a/src/video_core/engines/maxwell_dma.cpp +++ b/src/video_core/engines/maxwell_dma.cpp @@ -64,6 +64,7 @@ void MaxwellDMA::Launch() { // TODO(Subv): Perform more research and implement all features of this engine. const LaunchDMA& launch = regs.launch_dma; ASSERT(launch.interrupt_type == LaunchDMA::InterruptType::NONE); + ASSERT(launch.data_transfer_type == LaunchDMA::DataTransferType::NON_PIPELINED); if (launch.multi_line_enable) { const bool is_src_pitch = launch.src_memory_layout == LaunchDMA::MemoryLayout::PITCH; @@ -156,6 +157,8 @@ void MaxwellDMA::Launch() { } void MaxwellDMA::CopyBlockLinearToPitch() { + UNIMPLEMENTED_IF(regs.launch_dma.remap_enable != 0); + u32 bytes_per_pixel = 1; DMA::ImageOperand src_operand; src_operand.bytes_per_pixel = bytes_per_pixel;