From 4863c251f1ad11c92f8d955216300ee70cb9138f Mon Sep 17 00:00:00 2001 From: boykopovar Date: Sun, 13 Sep 2026 15:09:19 +0300 Subject: [PATCH] refactor(AgcDriver): add subdirs to libSceAgcDriver + separated new src --- core/libs/prx/libSceAgcDriver/CMakeLists.txt | 13 ++-- .../prx/libSceAgcDriver/Eq/include/Event.hpp | 4 ++ .../prx/libSceAgcDriver/Eq/include/Query.hpp | 4 ++ .../Eq/{Export.cpp => src/Event.cpp} | 14 +---- .../libs/prx/libSceAgcDriver/Eq/src/Query.cpp | 22 +++++++ .../Resource/include/Lifecycle.hpp | 4 ++ .../Resource/include/Registration.hpp | 4 ++ .../Resource/src/Lifecycle.cpp | 21 +++++++ .../{Export.cpp => src/Registration.cpp} | 13 +--- .../State/include/Configuration.hpp | 4 ++ .../libSceAgcDriver/State/include/Status.hpp | 4 ++ .../{Export.cpp => src/Configuration.cpp} | 17 +----- .../prx/libSceAgcDriver/State/src/Status.cpp | 25 ++++++++ .../prx/libSceAgcDriver/Submit/Export.cpp | 60 ------------------- .../libSceAgcDriver/Submit/include/Acb.hpp | 4 ++ .../Submit/include/CommandBuffer.hpp | 4 ++ .../libSceAgcDriver/Submit/include/Dcb.hpp | 4 ++ .../prx/libSceAgcDriver/Submit/src/Acb.cpp | 26 ++++++++ .../Submit/src/CommandBuffer.cpp | 26 ++++++++ .../prx/libSceAgcDriver/Submit/src/Dcb.cpp | 30 ++++++++++ 20 files changed, 201 insertions(+), 102 deletions(-) create mode 100644 core/libs/prx/libSceAgcDriver/Eq/include/Event.hpp create mode 100644 core/libs/prx/libSceAgcDriver/Eq/include/Query.hpp rename core/libs/prx/libSceAgcDriver/Eq/{Export.cpp => src/Event.cpp} (61%) create mode 100644 core/libs/prx/libSceAgcDriver/Eq/src/Query.cpp create mode 100644 core/libs/prx/libSceAgcDriver/Resource/include/Lifecycle.hpp create mode 100644 core/libs/prx/libSceAgcDriver/Resource/include/Registration.hpp create mode 100644 core/libs/prx/libSceAgcDriver/Resource/src/Lifecycle.cpp rename core/libs/prx/libSceAgcDriver/Resource/{Export.cpp => src/Registration.cpp} (72%) create mode 100644 core/libs/prx/libSceAgcDriver/State/include/Configuration.hpp create mode 100644 core/libs/prx/libSceAgcDriver/State/include/Status.hpp rename core/libs/prx/libSceAgcDriver/State/{Export.cpp => src/Configuration.cpp} (58%) create mode 100644 core/libs/prx/libSceAgcDriver/State/src/Status.cpp delete mode 100644 core/libs/prx/libSceAgcDriver/Submit/Export.cpp create mode 100644 core/libs/prx/libSceAgcDriver/Submit/include/Acb.hpp create mode 100644 core/libs/prx/libSceAgcDriver/Submit/include/CommandBuffer.hpp create mode 100644 core/libs/prx/libSceAgcDriver/Submit/include/Dcb.hpp create mode 100644 core/libs/prx/libSceAgcDriver/Submit/src/Acb.cpp create mode 100644 core/libs/prx/libSceAgcDriver/Submit/src/CommandBuffer.cpp create mode 100644 core/libs/prx/libSceAgcDriver/Submit/src/Dcb.cpp diff --git a/core/libs/prx/libSceAgcDriver/CMakeLists.txt b/core/libs/prx/libSceAgcDriver/CMakeLists.txt index 0b88d2643..6a7378196 100644 --- a/core/libs/prx/libSceAgcDriver/CMakeLists.txt +++ b/core/libs/prx/libSceAgcDriver/CMakeLists.txt @@ -1,8 +1,13 @@ add_library(libSceAgcDriver SHARED EXCLUDE_FROM_ALL - ${CMAKE_CURRENT_SOURCE_DIR}/Eq/Export.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Resource/Export.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/Submit/Export.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/State/Export.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Eq/src/Event.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Eq/src/Query.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Resource/src/Lifecycle.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Resource/src/Registration.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/State/src/Configuration.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/State/src/Status.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Submit/src/Acb.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Submit/src/CommandBuffer.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/Submit/src/Dcb.cpp ) target_include_directories(libSceAgcDriver PRIVATE ${LIBS_INCLUDE_DIR}) diff --git a/core/libs/prx/libSceAgcDriver/Eq/include/Event.hpp b/core/libs/prx/libSceAgcDriver/Eq/include/Event.hpp new file mode 100644 index 000000000..bbff9674a --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Eq/include/Event.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_EQ_INCLUDE_EVENT_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_EQ_INCLUDE_EVENT_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/Eq/include/Query.hpp b/core/libs/prx/libSceAgcDriver/Eq/include/Query.hpp new file mode 100644 index 000000000..46b65a4aa --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Eq/include/Query.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_EQ_INCLUDE_QUERY_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_EQ_INCLUDE_QUERY_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/Eq/Export.cpp b/core/libs/prx/libSceAgcDriver/Eq/src/Event.cpp similarity index 61% rename from core/libs/prx/libSceAgcDriver/Eq/Export.cpp rename to core/libs/prx/libSceAgcDriver/Eq/src/Event.cpp index 80b5b511a..ae82aee25 100644 --- a/core/libs/prx/libSceAgcDriver/Eq/Export.cpp +++ b/core/libs/prx/libSceAgcDriver/Eq/src/Event.cpp @@ -1,3 +1,5 @@ +#include "prx/libSceAgcDriver/Eq/include/Event.hpp" + #include #include #include "SceTypes.hpp" @@ -20,16 +22,4 @@ int APS5_VABI sceAgcDriverDeleteEqEvent(KernelEqueue eq, int id) { return 0; } -uint32_t APS5_VABI sceAgcDriverGetEqContextId(const KernelEvent* ev) { - (void)ev; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -int APS5_VABI sceAgcDriverGetEqEventType(const KernelEvent* ev) { - (void)ev; - NotImplemented_nid_no_patch(__func__); - return 0; -} - } diff --git a/core/libs/prx/libSceAgcDriver/Eq/src/Query.cpp b/core/libs/prx/libSceAgcDriver/Eq/src/Query.cpp new file mode 100644 index 000000000..9668a5d73 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Eq/src/Query.cpp @@ -0,0 +1,22 @@ +#include "prx/libSceAgcDriver/Eq/include/Query.hpp" + +#include +#include +#include "SceTypes.hpp" +#include "prx/libc/include/General.hpp" + +extern "C" { + +uint32_t APS5_VABI sceAgcDriverGetEqContextId(const KernelEvent* ev) { + (void)ev; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +int APS5_VABI sceAgcDriverGetEqEventType(const KernelEvent* ev) { + (void)ev; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +} diff --git a/core/libs/prx/libSceAgcDriver/Resource/include/Lifecycle.hpp b/core/libs/prx/libSceAgcDriver/Resource/include/Lifecycle.hpp new file mode 100644 index 000000000..d2485e872 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Resource/include/Lifecycle.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_RESOURCE_INCLUDE_LIFECYCLE_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_RESOURCE_INCLUDE_LIFECYCLE_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/Resource/include/Registration.hpp b/core/libs/prx/libSceAgcDriver/Resource/include/Registration.hpp new file mode 100644 index 000000000..bcf672d32 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Resource/include/Registration.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_RESOURCE_INCLUDE_REGISTRATION_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_RESOURCE_INCLUDE_REGISTRATION_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/Resource/src/Lifecycle.cpp b/core/libs/prx/libSceAgcDriver/Resource/src/Lifecycle.cpp new file mode 100644 index 000000000..8ff5e49b4 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Resource/src/Lifecycle.cpp @@ -0,0 +1,21 @@ +#include "prx/libSceAgcDriver/Resource/include/Lifecycle.hpp" + +#include +#include +#include "SceTypes.hpp" +#include "prx/libc/include/General.hpp" + +extern "C" { + +uint32_t APS5_VABI sceAgcDriverInitResourceRegistration(void) { + NotImplemented_nid_no_patch(__func__); + return 0; +} + +uint32_t APS5_VABI sceAgcDriverQueryResourceRegistrationUserMemoryRequirements(uint64_t* size_in_bytes) { + (void)size_in_bytes; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +} diff --git a/core/libs/prx/libSceAgcDriver/Resource/Export.cpp b/core/libs/prx/libSceAgcDriver/Resource/src/Registration.cpp similarity index 72% rename from core/libs/prx/libSceAgcDriver/Resource/Export.cpp rename to core/libs/prx/libSceAgcDriver/Resource/src/Registration.cpp index 53c9d75ee..35e29c61c 100644 --- a/core/libs/prx/libSceAgcDriver/Resource/Export.cpp +++ b/core/libs/prx/libSceAgcDriver/Resource/src/Registration.cpp @@ -1,3 +1,5 @@ +#include "prx/libSceAgcDriver/Resource/include/Registration.hpp" + #include #include #include "SceTypes.hpp" @@ -5,17 +7,6 @@ extern "C" { -uint32_t APS5_VABI sceAgcDriverInitResourceRegistration(void) { - NotImplemented_nid_no_patch(__func__); - return 0; -} - -uint32_t APS5_VABI sceAgcDriverQueryResourceRegistrationUserMemoryRequirements(uint64_t* size_in_bytes) { - (void)size_in_bytes; - NotImplemented_nid_no_patch(__func__); - return 0; -} - int APS5_VABI sceAgcDriverRegisterOwner(void) { NotImplemented_nid_no_patch(__func__); return 0; diff --git a/core/libs/prx/libSceAgcDriver/State/include/Configuration.hpp b/core/libs/prx/libSceAgcDriver/State/include/Configuration.hpp new file mode 100644 index 000000000..aadd076ce --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/State/include/Configuration.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_STATE_INCLUDE_CONFIGURATION_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_STATE_INCLUDE_CONFIGURATION_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/State/include/Status.hpp b/core/libs/prx/libSceAgcDriver/State/include/Status.hpp new file mode 100644 index 000000000..d7184e323 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/State/include/Status.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_STATE_INCLUDE_STATUS_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_STATE_INCLUDE_STATUS_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/State/Export.cpp b/core/libs/prx/libSceAgcDriver/State/src/Configuration.cpp similarity index 58% rename from core/libs/prx/libSceAgcDriver/State/Export.cpp rename to core/libs/prx/libSceAgcDriver/State/src/Configuration.cpp index 276a53e6e..fa1ae944e 100644 --- a/core/libs/prx/libSceAgcDriver/State/Export.cpp +++ b/core/libs/prx/libSceAgcDriver/State/src/Configuration.cpp @@ -1,3 +1,5 @@ +#include "prx/libSceAgcDriver/State/include/Configuration.hpp" + #include #include #include "SceTypes.hpp" @@ -20,19 +22,4 @@ int APS5_VABI sceAgcDriverSetTFRing(const volatile void* base, uint32_t size) { return 0; } -bool APS5_VABI sceAgcDriverIsCaptureInProgress(void) { - NotImplemented_nid_no_patch(__func__); - return false; -} - -bool APS5_VABI sceAgcDriverIsTraceInProgress(void) { - NotImplemented_nid_no_patch(__func__); - return false; -} - -bool APS5_VABI sceAgcDriverIsSubmitValidationEnabled(void) { - NotImplemented_nid_no_patch(__func__); - return false; -} - } diff --git a/core/libs/prx/libSceAgcDriver/State/src/Status.cpp b/core/libs/prx/libSceAgcDriver/State/src/Status.cpp new file mode 100644 index 000000000..7d804b7ce --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/State/src/Status.cpp @@ -0,0 +1,25 @@ +#include "prx/libSceAgcDriver/State/include/Status.hpp" + +#include +#include +#include "SceTypes.hpp" +#include "prx/libc/include/General.hpp" + +extern "C" { + +bool APS5_VABI sceAgcDriverIsCaptureInProgress(void) { + NotImplemented_nid_no_patch(__func__); + return false; +} + +bool APS5_VABI sceAgcDriverIsTraceInProgress(void) { + NotImplemented_nid_no_patch(__func__); + return false; +} + +bool APS5_VABI sceAgcDriverIsSubmitValidationEnabled(void) { + NotImplemented_nid_no_patch(__func__); + return false; +} + +} diff --git a/core/libs/prx/libSceAgcDriver/Submit/Export.cpp b/core/libs/prx/libSceAgcDriver/Submit/Export.cpp deleted file mode 100644 index 6481c3f04..000000000 --- a/core/libs/prx/libSceAgcDriver/Submit/Export.cpp +++ /dev/null @@ -1,60 +0,0 @@ -#include -#include -#include "SceTypes.hpp" -#include "prx/libc/include/General.hpp" - -extern "C" { - -int APS5_VABI sceAgcDriverSubmitAcb(uint32_t queue, const Packet* packet) { - (void)queue; - (void)packet; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -int APS5_VABI sceAgcDriverSubmitCommandBuffer(void* queue_context, const Packet* packet) { - (void)queue_context; - (void)packet; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -int APS5_VABI sceAgcDriverSubmitDcb(const Packet* packet) { - (void)packet; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -int APS5_VABI sceAgcDriverSubmitMultiAcbs(uint32_t queue, uint32_t* const* acbs, const uint32_t* sizes_in_dwords, uint32_t count) { - (void)queue; - (void)acbs; - (void)sizes_in_dwords; - (void)count; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -int APS5_VABI sceAgcDriverSubmitMultiCommandBuffers(void* queue_context, uint32_t* const* command_buffers, const uint32_t* sizes_in_dwords, uint32_t count) { - (void)queue_context; - (void)command_buffers; - (void)sizes_in_dwords; - (void)count; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -int APS5_VABI sceAgcDriverSubmitMultiDcbs(uint32_t* const* dcb_gpu_addrs, const uint32_t* dcb_sizes_in_dwords, uint32_t count) { - (void)dcb_gpu_addrs; - (void)dcb_sizes_in_dwords; - (void)count; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -int APS5_VABI sceAgcDriverAgrSubmitDcb(const Packet* packet) { - (void)packet; - NotImplemented_nid_no_patch(__func__); - return 0; -} - -} diff --git a/core/libs/prx/libSceAgcDriver/Submit/include/Acb.hpp b/core/libs/prx/libSceAgcDriver/Submit/include/Acb.hpp new file mode 100644 index 000000000..21eebade6 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Submit/include/Acb.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_SUBMIT_INCLUDE_ACB_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_SUBMIT_INCLUDE_ACB_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/Submit/include/CommandBuffer.hpp b/core/libs/prx/libSceAgcDriver/Submit/include/CommandBuffer.hpp new file mode 100644 index 000000000..ef4b9e689 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Submit/include/CommandBuffer.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_SUBMIT_INCLUDE_COMMANDBUFFER_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_SUBMIT_INCLUDE_COMMANDBUFFER_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/Submit/include/Dcb.hpp b/core/libs/prx/libSceAgcDriver/Submit/include/Dcb.hpp new file mode 100644 index 000000000..d31720788 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Submit/include/Dcb.hpp @@ -0,0 +1,4 @@ +#ifndef CORE_LIBS_PRX_LIBSCEAGCDRIVER_SUBMIT_INCLUDE_DCB_HPP +#define CORE_LIBS_PRX_LIBSCEAGCDRIVER_SUBMIT_INCLUDE_DCB_HPP + +#endif diff --git a/core/libs/prx/libSceAgcDriver/Submit/src/Acb.cpp b/core/libs/prx/libSceAgcDriver/Submit/src/Acb.cpp new file mode 100644 index 000000000..29ed402e7 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Submit/src/Acb.cpp @@ -0,0 +1,26 @@ +#include "prx/libSceAgcDriver/Submit/include/Acb.hpp" + +#include +#include +#include "SceTypes.hpp" +#include "prx/libc/include/General.hpp" + +extern "C" { + +int APS5_VABI sceAgcDriverSubmitAcb(uint32_t queue, const Packet* packet) { + (void)queue; + (void)packet; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +int APS5_VABI sceAgcDriverSubmitMultiAcbs(uint32_t queue, uint32_t* const* acbs, const uint32_t* sizes_in_dwords, uint32_t count) { + (void)queue; + (void)acbs; + (void)sizes_in_dwords; + (void)count; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +} diff --git a/core/libs/prx/libSceAgcDriver/Submit/src/CommandBuffer.cpp b/core/libs/prx/libSceAgcDriver/Submit/src/CommandBuffer.cpp new file mode 100644 index 000000000..646827ca1 --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Submit/src/CommandBuffer.cpp @@ -0,0 +1,26 @@ +#include "prx/libSceAgcDriver/Submit/include/CommandBuffer.hpp" + +#include +#include +#include "SceTypes.hpp" +#include "prx/libc/include/General.hpp" + +extern "C" { + +int APS5_VABI sceAgcDriverSubmitCommandBuffer(void* queue_context, const Packet* packet) { + (void)queue_context; + (void)packet; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +int APS5_VABI sceAgcDriverSubmitMultiCommandBuffers(void* queue_context, uint32_t* const* command_buffers, const uint32_t* sizes_in_dwords, uint32_t count) { + (void)queue_context; + (void)command_buffers; + (void)sizes_in_dwords; + (void)count; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +} diff --git a/core/libs/prx/libSceAgcDriver/Submit/src/Dcb.cpp b/core/libs/prx/libSceAgcDriver/Submit/src/Dcb.cpp new file mode 100644 index 000000000..92bad3fdd --- /dev/null +++ b/core/libs/prx/libSceAgcDriver/Submit/src/Dcb.cpp @@ -0,0 +1,30 @@ +#include "prx/libSceAgcDriver/Submit/include/Dcb.hpp" + +#include +#include +#include "SceTypes.hpp" +#include "prx/libc/include/General.hpp" + +extern "C" { + +int APS5_VABI sceAgcDriverSubmitDcb(const Packet* packet) { + (void)packet; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +int APS5_VABI sceAgcDriverSubmitMultiDcbs(uint32_t* const* dcb_gpu_addrs, const uint32_t* dcb_sizes_in_dwords, uint32_t count) { + (void)dcb_gpu_addrs; + (void)dcb_sizes_in_dwords; + (void)count; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +int APS5_VABI sceAgcDriverAgrSubmitDcb(const Packet* packet) { + (void)packet; + NotImplemented_nid_no_patch(__func__); + return 0; +} + +}