Merge 641691c497 into 3066887ff4

CMakeLists.txt

@@ -126,8 +126,7 @@ CMAKE_DEPENDENT_OPTION(ENABLE_LIBUSB "Enable libusb for GameCube Adapter support
 
 CMAKE_DEPENDENT_OPTION(ENABLE_SOFTWARE_RENDERER "Enables the software renderer" ON "NOT ANDROID" OFF)
 CMAKE_DEPENDENT_OPTION(ENABLE_OPENGL "Enables the OpenGL renderer" ${DEFAULT_ENABLE_OPENGL} "NOT APPLE" OFF)
-# NetBSD doesn't support Vulkan yet, remove this check when it does.
-CMAKE_DEPENDENT_OPTION(ENABLE_VULKAN "Enables the Vulkan renderer" ON "NOT (BSD MATCHES \"NetBSD\")" OFF)
+option(ENABLE_VULKAN "Enables the Vulkan renderer" ON)
 
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 

CMakeModules/DisablePaxMprotect.cmake

@@ -1,11 +0,0 @@
-function(disable_pax_mprotect target)
-    if (BSD STREQUAL "NetBSD")
-        add_custom_command(TARGET ${target} POST_BUILD
-            COMMAND paxctl +m "$<TARGET_FILE:${target}>"
-            COMMENT "Disabling PaX MPROTECT restrictions for '${target}'"
-            VERBATIM
-        )
-    else()
-        message(FATAL_ERROR "disable_pax_mprotect only applies on NetBSD.")
-    endif()
-endfunction()

externals/CMakeLists.txt

@@ -60,7 +60,6 @@ if (ENABLE_TESTS)
         add_subdirectory(catch2)
     endif()
     target_link_libraries(catch2 INTERFACE Catch2::Catch2WithMain)
-    include(Catch)
 endif()
 
 # Crypto++
@@ -500,15 +499,6 @@ if (ENABLE_VULKAN)
     else()
         target_include_directories(vulkan-headers INTERFACE ./vulkan-headers/include)
         target_disable_warnings(vulkan-headers)
-        if (BSD STREQUAL "NetBSD")
-            # There may be a better way to do this with
-            # find_package(X11), but I couldn't get
-            # CMake to do it, so we're depending on
-            # the x11-links package and assuming the
-            # prefix location. -OS
-            target_include_directories(vulkan-headers INTERFACE
-                /usr/pkg/share/x11-links/include)
-        endif()
     endif()
 
     # adrenotools
@@ -529,4 +519,4 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|armv8")
 else()
     target_compile_definitions(xxhash PRIVATE XXH_VECTOR=XXH_SCALAR)
     message(STATUS "Disabling SIMD for xxHash")
-endif()
+endif()

src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.kt

@@ -504,9 +504,8 @@ object NativeLibrary {
             const val ErrorSystemFiles = 8
             const val ErrorSavestate = 9
             const val ErrorArticDisconnected = 10
-            const val ErrorN3DSApplication = 11
-            const val ShutdownRequested = 12
-            const val ErrorUnknown = 13
+            const val ShutdownRequested = 11
+            const val ErrorUnknown = 12
 
             fun newInstance(resultCode: Int): EmulationErrorDialogFragment {
                 val args = Bundle()

src/android/app/src/main/res/layout/fragment_system_files.xml

@@ -5,13 +5,13 @@
     android:id="@+id/coordinator_about"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:background="?attr/colorSurface">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_about"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_system_files"

src/citra_libretro/CMakeLists.txt

@@ -31,11 +31,6 @@ add_library(azahar_libretro SHARED
 
 create_target_directory_groups(azahar_libretro)
 
-if (BSD STREQUAL "NetBSD")
-    include(DisablePaxMprotect)
-    disable_pax_mprotect(azahar_libretro)
-endif()
-
 target_link_libraries(citra_common PRIVATE libretro)
 target_link_libraries(citra_core PRIVATE libretro)
 target_link_libraries(video_core PRIVATE libretro)

src/citra_meta/CMakeLists.txt

@@ -6,11 +6,6 @@ add_executable(citra_meta
 
 set_target_properties(citra_meta PROPERTIES OUTPUT_NAME "azahar")
 
-if (BSD STREQUAL "NetBSD")
-    include(DisablePaxMprotect)
-    disable_pax_mprotect(citra_meta)
-endif()
-
 if (APPLE)
     set(DIST_DIR "../../dist/apple")
     set(APPLE_RESOURCES

src/citra_room_standalone/CMakeLists.txt

@@ -4,11 +4,6 @@ add_executable(citra_room_standalone
 
 set_target_properties(citra_room_standalone PROPERTIES OUTPUT_NAME "azahar-room")
 
-if (BSD STREQUAL "NetBSD")
-    include(DisablePaxMprotect)
-    disable_pax_mprotect(citra_room_standalone)
-endif()
-
 target_link_libraries(citra_room_standalone PRIVATE citra_room)
 
 if(UNIX AND NOT APPLE)

src/tests/CMakeLists.txt

@@ -23,11 +23,6 @@ add_executable(tests
 
 create_target_directory_groups(tests)
 
-if (BSD STREQUAL "NetBSD")
-    include(DisablePaxMprotect)
-    disable_pax_mprotect(tests)
-endif()
-
 target_link_libraries(tests PRIVATE citra_common citra_core video_core audio_core)
 target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} catch2 nihstro-headers Threads::Threads)
 
@@ -36,10 +31,6 @@ if (ENABLE_LIBRETRO)
 endif()
 
 add_test(NAME tests COMMAND tests)
-if(NOT ANDROID)
-    catch_discover_tests(tests)
-endif()
-
 
 if (CITRA_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(tests PRIVATE precompiled_headers.h)

src/tests/video_core/shader.cpp

@@ -481,39 +481,6 @@ SHADER_TEST_CASE("RSQ", "[video_core][shader]") {
     REQUIRE(shader.Run({0.0625f}).x == Catch::Approx(4.0f).margin(0.004f));
 }
 
-SHADER_TEST_CASE("SETEMIT", "[video_core][shader]") {
-    Pica::GeometryEmitter geometry_emitter;
-
-    for (u8 winding = 0; winding <= 1; ++winding) {
-        for (u8 prim_emit = 0; prim_emit <= 1; ++prim_emit) {
-            for (u8 vertex_id = 0; vertex_id <= 3; ++vertex_id) {
-                auto shader_setup = CompileShaderSetup({
-                    {OpCode::Id::NOP}, // setemit
-                    {OpCode::Id::END},
-                });
-
-                // nihstro does not support the SETEMIT instructions, so the instruction-binary must
-                // be manually
-                // inserted here:
-                nihstro::Instruction SETEMIT = {};
-                SETEMIT.opcode = nihstro::OpCode(nihstro::OpCode::Id::SETEMIT);
-                SETEMIT.setemit.winding.Assign(winding);
-                SETEMIT.setemit.prim_emit.Assign(prim_emit);
-                SETEMIT.setemit.vertex_id.Assign(vertex_id);
-                shader_setup->UpdateProgramCode(0, SETEMIT.hex);
-
-                auto shader = TestType(std::move(shader_setup));
-                Pica::ShaderUnit shader_unit(&geometry_emitter);
-                shader.Run(shader_unit, 1.0f);
-
-                REQUIRE(geometry_emitter.emit_state.winding == winding);
-                REQUIRE(geometry_emitter.emit_state.prim_emit == prim_emit);
-                REQUIRE(geometry_emitter.emit_state.vertex_id == vertex_id);
-            }
-        }
-    }
-}
-
 SHADER_TEST_CASE("Uniform Read", "[video_core][shader]") {
     const auto sh_input = SourceRegister::MakeInput(0);
     const auto sh_c0 = SourceRegister::MakeFloat(0);

src/video_core/pica/packed_attribute.h

@@ -1,10 +1,9 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
 #pragma once
 
-#include <bit>
 #include <boost/serialization/binary_object.hpp>
 
 #include "common/vector_math.h"

src/video_core/pica/shader_unit.cpp

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -29,15 +29,15 @@ void ShaderUnit::WriteOutput(const ShaderRegs& config, AttributeBuffer& buffer)
 }
 
 void GeometryEmitter::Emit(std::span<Common::Vec4<f24>, 16> output_regs) {
-    ASSERT(emit_state.vertex_id < 3);
+    ASSERT(vertex_id < 3);
 
     u32 output_index{};
     for (u32 reg : Common::BitSet<u32>(output_mask)) {
-        buffer[emit_state.vertex_id][output_index++] = output_regs[reg];
+        buffer[vertex_id][output_index++] = output_regs[reg];
     }
 
-    if (emit_state.prim_emit) {
-        if (emit_state.winding) {
+    if (prim_emit) {
+        if (winding) {
             handlers->winding_setter();
         }
         for (std::size_t i = 0; i < buffer.size(); ++i) {

src/video_core/pica/shader_unit.h

@@ -1,4 +1,4 @@
-// Copyright Citra Emulator Project / Azahar Emulator Project
+// Copyright 2023 Citra Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -75,18 +75,11 @@ struct GeometryEmitter {
     void Emit(std::span<Common::Vec4<f24>, 16> output_regs);
 
 public:
-    union EmitState {
-        struct {
-            bool winding : 1;
-            bool prim_emit : 1;
-            u8 vertex_id : 2;
-        };
-        u8 raw;
-    } emit_state;
-    static_assert(sizeof(emit_state) == 1);
-
-    u32 output_mask;
     std::array<AttributeBuffer, 3> buffer;
+    u8 vertex_id;
+    bool prim_emit;
+    bool winding;
+    u32 output_mask;
     Handlers* handlers;
 
 private:
@@ -94,7 +87,9 @@ private:
     template <class Archive>
     void serialize(Archive& ar, const u32 file_version) {
         ar & buffer;
-        ar & emit_state.raw;
+        ar & vertex_id;
+        ar & prim_emit;
+        ar & winding;
         ar & output_mask;
     }
 };

src/video_core/shader/shader_interpreter.cpp

@@ -671,9 +671,9 @@ static void RunInterpreter(const ShaderSetup& setup, ShaderUnit& state,
             case OpCode::Id::SETEMIT: {
                 auto* emitter = state.emitter_ptr;
                 ASSERT_MSG(emitter, "Execute SETEMIT on VS");
-                emitter->emit_state.vertex_id = instr.setemit.vertex_id;
-                emitter->emit_state.prim_emit = instr.setemit.prim_emit != 0;
-                emitter->emit_state.winding = instr.setemit.winding != 0;
+                emitter->vertex_id = instr.setemit.vertex_id;
+                emitter->prim_emit = instr.setemit.prim_emit != 0;
+                emitter->winding = instr.setemit.winding != 0;
                 break;
             }
 

src/video_core/shader/shader_jit_a64_compiler.cpp

@@ -865,13 +865,12 @@ void JitShader::Compile_SETE(Instruction instr) {
 
     l(have_emitter);
 
-    const GeometryEmitter::EmitState new_state{
-        .winding = instr.setemit.winding != 0,
-        .prim_emit = instr.setemit.prim_emit != 0,
-        .vertex_id = static_cast<uint8_t>(instr.setemit.vertex_id),
-    };
-    MOV(XSCRATCH1.toW(), new_state.raw);
-    STRB(XSCRATCH1.toW(), XSCRATCH0, u32(offsetof(GeometryEmitter, emit_state)));
+    MOV(XSCRATCH1.toW(), instr.setemit.vertex_id);
+    STRB(XSCRATCH1.toW(), XSCRATCH0, u32(offsetof(GeometryEmitter, vertex_id)));
+    MOV(XSCRATCH1.toW(), instr.setemit.prim_emit);
+    STRB(XSCRATCH1.toW(), XSCRATCH0, u32(offsetof(GeometryEmitter, prim_emit)));
+    MOV(XSCRATCH1.toW(), instr.setemit.winding);
+    STRB(XSCRATCH1.toW(), XSCRATCH0, u32(offsetof(GeometryEmitter, winding)));
 
     l(end);
 }

src/video_core/shader/shader_jit_x64_compiler.cpp

@@ -905,12 +905,9 @@ void JitShader::Compile_SETE(Instruction instr) {
     jmp(end);
 
     L(have_emitter);
-    const GeometryEmitter::EmitState new_state{
-        .winding = instr.setemit.winding != 0,
-        .prim_emit = instr.setemit.prim_emit != 0,
-        .vertex_id = static_cast<uint8_t>(instr.setemit.vertex_id),
-    };
-    mov(byte[rax + offsetof(GeometryEmitter, emit_state)], new_state.raw);
+    mov(byte[rax + offsetof(GeometryEmitter, vertex_id)], instr.setemit.vertex_id);
+    mov(byte[rax + offsetof(GeometryEmitter, prim_emit)], instr.setemit.prim_emit);
+    mov(byte[rax + offsetof(GeometryEmitter, winding)], instr.setemit.winding);
     L(end);
 }