diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/build.gradle.kts | 11 | ||||
| -rw-r--r-- | src/core/hle/service/cmif_types.h | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index d44bb4c74..cb026211c 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -259,13 +259,20 @@ fun runGitCommand(command: List<String>): String { } fun getGitVersion(): String { - val gitVersion = runGitCommand(listOf("git", "describe", "--always", "--long")) + val gitVersion = runGitCommand( + listOf( + "git", + "describe", + "--always", + "--long" + ) + ).replace(Regex("(-0)?-[^-]+$"), "") val versionName = if (System.getenv("GITHUB_ACTIONS") != null) { System.getenv("GIT_TAG_NAME") ?: gitVersion } else { gitVersion } - return versionName.replace(Regex("(-0)?-[^-]+$"), "").ifEmpty { "0.0" } + return versionName.ifEmpty { "0.0" } } fun getGitHash(): String = diff --git a/src/core/hle/service/cmif_types.h b/src/core/hle/service/cmif_types.h index 84f4c2456..325304d5c 100644 --- a/src/core/hle/service/cmif_types.h +++ b/src/core/hle/service/cmif_types.h @@ -262,7 +262,7 @@ class OutLargeData { public: static_assert(std::is_trivially_copyable_v<T>, "LargeData type must be trivially copyable"); static_assert((A & BufferAttr_In) == 0, "OutLargeData attr must not be In"); - static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_In | BufferAttr_FixedSize); + static constexpr BufferAttr Attr = static_cast<BufferAttr>(A | BufferAttr_Out | BufferAttr_FixedSize); using Type = T; /* implicit */ OutLargeData(const OutLargeData& t) : raw(t.raw) {} |