diff options
| -rwxr-xr-x | .ci/scripts/transifex/docker.sh | 8 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | src/audio_core/sink/sdl2_sink.cpp | 4 | ||||
| -rw-r--r-- | src/core/hid/irs_types.h | 20 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/irsensor/pointing_processor.h | 4 | ||||
| -rw-r--r-- | src/video_core/texture_cache/descriptor_table.h | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/texture_cache.h | 8 |
8 files changed, 23 insertions, 29 deletions
diff --git a/.ci/scripts/transifex/docker.sh b/.ci/scripts/transifex/docker.sh index af7529944..6ddbfd0dd 100755 --- a/.ci/scripts/transifex/docker.sh +++ b/.ci/scripts/transifex/docker.sh | |||
| @@ -3,14 +3,6 @@ | |||
| 3 | # SPDX-FileCopyrightText: 2021 yuzu Emulator Project | 3 | # SPDX-FileCopyrightText: 2021 yuzu Emulator Project |
| 4 | # SPDX-License-Identifier: GPL-2.0-or-later | 4 | # SPDX-License-Identifier: GPL-2.0-or-later |
| 5 | 5 | ||
| 6 | # Setup RC file for tx | ||
| 7 | cat << EOF > ~/.transifexrc | ||
| 8 | [https://www.transifex.com] | ||
| 9 | rest_hostname = https://rest.api.transifex.com | ||
| 10 | token = $TRANSIFEX_API_TOKEN | ||
| 11 | EOF | ||
| 12 | |||
| 13 | |||
| 14 | set -x | 6 | set -x |
| 15 | 7 | ||
| 16 | echo -e "\e[1m\e[33mBuild tools information:\e[0m" | 8 | echo -e "\e[1m\e[33mBuild tools information:\e[0m" |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa5824824..25ef1f078 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml | |||
| @@ -19,11 +19,11 @@ jobs: | |||
| 19 | - uses: actions/checkout@v3 | 19 | - uses: actions/checkout@v3 |
| 20 | with: | 20 | with: |
| 21 | submodules: recursive | 21 | submodules: recursive |
| 22 | fetch-depth: 0 | 22 | fetch-depth: 0 |
| 23 | - name: Update Translation | 23 | - name: Update Translation |
| 24 | run: ./.ci/scripts/transifex/docker.sh | 24 | run: ./.ci/scripts/transifex/docker.sh |
| 25 | env: | 25 | env: |
| 26 | TRANSIFEX_API_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} | 26 | TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} |
| 27 | 27 | ||
| 28 | reuse: | 28 | reuse: |
| 29 | runs-on: ubuntu-latest | 29 | runs-on: ubuntu-latest |
diff --git a/src/audio_core/sink/sdl2_sink.cpp b/src/audio_core/sink/sdl2_sink.cpp index f12ebf7fe..c138dc628 100644 --- a/src/audio_core/sink/sdl2_sink.cpp +++ b/src/audio_core/sink/sdl2_sink.cpp | |||
| @@ -230,7 +230,9 @@ std::vector<std::string> ListSDLSinkDevices(bool capture) { | |||
| 230 | 230 | ||
| 231 | const int device_count = SDL_GetNumAudioDevices(capture); | 231 | const int device_count = SDL_GetNumAudioDevices(capture); |
| 232 | for (int i = 0; i < device_count; ++i) { | 232 | for (int i = 0; i < device_count; ++i) { |
| 233 | device_list.emplace_back(SDL_GetAudioDeviceName(i, 0)); | 233 | if (const char* name = SDL_GetAudioDeviceName(i, capture)) { |
| 234 | device_list.emplace_back(name); | ||
| 235 | } | ||
| 234 | } | 236 | } |
| 235 | 237 | ||
| 236 | return device_list; | 238 | return device_list; |
diff --git a/src/core/hid/irs_types.h b/src/core/hid/irs_types.h index 88c5b016d..0d1bfe53f 100644 --- a/src/core/hid/irs_types.h +++ b/src/core/hid/irs_types.h | |||
| @@ -14,7 +14,7 @@ enum class CameraAmbientNoiseLevel : u32 { | |||
| 14 | Low, | 14 | Low, |
| 15 | Medium, | 15 | Medium, |
| 16 | High, | 16 | High, |
| 17 | Unkown3, // This level can't be reached | 17 | Unknown3, // This level can't be reached |
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | // This is nn::irsensor::CameraLightTarget | 20 | // This is nn::irsensor::CameraLightTarget |
| @@ -75,9 +75,9 @@ enum class IrCameraStatus : u32 { | |||
| 75 | enum class IrCameraInternalStatus : u32 { | 75 | enum class IrCameraInternalStatus : u32 { |
| 76 | Stopped, | 76 | Stopped, |
| 77 | FirmwareUpdateNeeded, | 77 | FirmwareUpdateNeeded, |
| 78 | Unkown2, | 78 | Unknown2, |
| 79 | Unkown3, | 79 | Unknown3, |
| 80 | Unkown4, | 80 | Unknown4, |
| 81 | FirmwareVersionRequested, | 81 | FirmwareVersionRequested, |
| 82 | FirmwareVersionIsInvalid, | 82 | FirmwareVersionIsInvalid, |
| 83 | Ready, | 83 | Ready, |
| @@ -121,20 +121,20 @@ enum class IrSensorFunctionLevel : u8 { | |||
| 121 | 121 | ||
| 122 | // This is nn::irsensor::MomentProcessorPreprocess | 122 | // This is nn::irsensor::MomentProcessorPreprocess |
| 123 | enum class MomentProcessorPreprocess : u32 { | 123 | enum class MomentProcessorPreprocess : u32 { |
| 124 | Unkown0, | 124 | Unknown0, |
| 125 | Unkown1, | 125 | Unknown1, |
| 126 | }; | 126 | }; |
| 127 | 127 | ||
| 128 | // This is nn::irsensor::PackedMomentProcessorPreprocess | 128 | // This is nn::irsensor::PackedMomentProcessorPreprocess |
| 129 | enum class PackedMomentProcessorPreprocess : u8 { | 129 | enum class PackedMomentProcessorPreprocess : u8 { |
| 130 | Unkown0, | 130 | Unknown0, |
| 131 | Unkown1, | 131 | Unknown1, |
| 132 | }; | 132 | }; |
| 133 | 133 | ||
| 134 | // This is nn::irsensor::PointingStatus | 134 | // This is nn::irsensor::PointingStatus |
| 135 | enum class PointingStatus : u32 { | 135 | enum class PointingStatus : u32 { |
| 136 | Unkown0, | 136 | Unknown0, |
| 137 | Unkown1, | 137 | Unknown1, |
| 138 | }; | 138 | }; |
| 139 | 139 | ||
| 140 | struct IrsRect { | 140 | struct IrsRect { |
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 46bad7871..79375bd2f 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -2118,7 +2118,7 @@ void Hid::WritePalmaWaveEntry(Kernel::HLERequestContext& ctx) { | |||
| 2118 | ASSERT_MSG(t_mem->GetSize() == 0x3000, "t_mem has incorrect size"); | 2118 | ASSERT_MSG(t_mem->GetSize() == 0x3000, "t_mem has incorrect size"); |
| 2119 | 2119 | ||
| 2120 | LOG_WARNING(Service_HID, | 2120 | LOG_WARNING(Service_HID, |
| 2121 | "(STUBBED) called, connection_handle={}, wave_set={}, unkown={}, " | 2121 | "(STUBBED) called, connection_handle={}, wave_set={}, unknown={}, " |
| 2122 | "t_mem_handle=0x{:08X}, t_mem_size={}, size={}", | 2122 | "t_mem_handle=0x{:08X}, t_mem_size={}, size={}", |
| 2123 | connection_handle.npad_id, wave_set, unknown, t_mem_handle, t_mem_size, size); | 2123 | connection_handle.npad_id, wave_set, unknown, t_mem_handle, t_mem_size, size); |
| 2124 | 2124 | ||
diff --git a/src/core/hle/service/hid/irsensor/pointing_processor.h b/src/core/hle/service/hid/irsensor/pointing_processor.h index cf4930794..d63423aff 100644 --- a/src/core/hle/service/hid/irsensor/pointing_processor.h +++ b/src/core/hle/service/hid/irsensor/pointing_processor.h | |||
| @@ -37,10 +37,10 @@ private: | |||
| 37 | u8 pointing_status; | 37 | u8 pointing_status; |
| 38 | INSERT_PADDING_BYTES(3); | 38 | INSERT_PADDING_BYTES(3); |
| 39 | u32 unknown; | 39 | u32 unknown; |
| 40 | float unkown_float1; | 40 | float unknown_float1; |
| 41 | float position_x; | 41 | float position_x; |
| 42 | float position_y; | 42 | float position_y; |
| 43 | float unkown_float2; | 43 | float unknown_float2; |
| 44 | Core::IrSensor::IrsRect window_of_interest; | 44 | Core::IrSensor::IrsRect window_of_interest; |
| 45 | }; | 45 | }; |
| 46 | static_assert(sizeof(PointingProcessorMarkerData) == 0x20, | 46 | static_assert(sizeof(PointingProcessorMarkerData) == 0x20, |
diff --git a/src/video_core/texture_cache/descriptor_table.h b/src/video_core/texture_cache/descriptor_table.h index b18e3838f..ee4240288 100644 --- a/src/video_core/texture_cache/descriptor_table.h +++ b/src/video_core/texture_cache/descriptor_table.h | |||
| @@ -18,7 +18,7 @@ class DescriptorTable { | |||
| 18 | public: | 18 | public: |
| 19 | explicit DescriptorTable(Tegra::MemoryManager& gpu_memory_) : gpu_memory{gpu_memory_} {} | 19 | explicit DescriptorTable(Tegra::MemoryManager& gpu_memory_) : gpu_memory{gpu_memory_} {} |
| 20 | 20 | ||
| 21 | [[nodiscard]] bool Synchornize(GPUVAddr gpu_addr, u32 limit) { | 21 | [[nodiscard]] bool Synchronize(GPUVAddr gpu_addr, u32 limit) { |
| 22 | [[likely]] if (current_gpu_addr == gpu_addr && current_limit == limit) { | 22 | [[likely]] if (current_gpu_addr == gpu_addr && current_limit == limit) { |
| 23 | return false; | 23 | return false; |
| 24 | } | 24 | } |
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 413baf730..0e0fd410f 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h | |||
| @@ -193,11 +193,11 @@ void TextureCache<P>::SynchronizeGraphicsDescriptors() { | |||
| 193 | const bool linked_tsc = maxwell3d->regs.sampler_binding == SamplerBinding::ViaHeaderBinding; | 193 | const bool linked_tsc = maxwell3d->regs.sampler_binding == SamplerBinding::ViaHeaderBinding; |
| 194 | const u32 tic_limit = maxwell3d->regs.tex_header.limit; | 194 | const u32 tic_limit = maxwell3d->regs.tex_header.limit; |
| 195 | const u32 tsc_limit = linked_tsc ? tic_limit : maxwell3d->regs.tex_sampler.limit; | 195 | const u32 tsc_limit = linked_tsc ? tic_limit : maxwell3d->regs.tex_sampler.limit; |
| 196 | if (channel_state->graphics_sampler_table.Synchornize(maxwell3d->regs.tex_sampler.Address(), | 196 | if (channel_state->graphics_sampler_table.Synchronize(maxwell3d->regs.tex_sampler.Address(), |
| 197 | tsc_limit)) { | 197 | tsc_limit)) { |
| 198 | channel_state->graphics_sampler_ids.resize(tsc_limit + 1, CORRUPT_ID); | 198 | channel_state->graphics_sampler_ids.resize(tsc_limit + 1, CORRUPT_ID); |
| 199 | } | 199 | } |
| 200 | if (channel_state->graphics_image_table.Synchornize(maxwell3d->regs.tex_header.Address(), | 200 | if (channel_state->graphics_image_table.Synchronize(maxwell3d->regs.tex_header.Address(), |
| 201 | tic_limit)) { | 201 | tic_limit)) { |
| 202 | channel_state->graphics_image_view_ids.resize(tic_limit + 1, CORRUPT_ID); | 202 | channel_state->graphics_image_view_ids.resize(tic_limit + 1, CORRUPT_ID); |
| 203 | } | 203 | } |
| @@ -209,10 +209,10 @@ void TextureCache<P>::SynchronizeComputeDescriptors() { | |||
| 209 | const u32 tic_limit = kepler_compute->regs.tic.limit; | 209 | const u32 tic_limit = kepler_compute->regs.tic.limit; |
| 210 | const u32 tsc_limit = linked_tsc ? tic_limit : kepler_compute->regs.tsc.limit; | 210 | const u32 tsc_limit = linked_tsc ? tic_limit : kepler_compute->regs.tsc.limit; |
| 211 | const GPUVAddr tsc_gpu_addr = kepler_compute->regs.tsc.Address(); | 211 | const GPUVAddr tsc_gpu_addr = kepler_compute->regs.tsc.Address(); |
| 212 | if (channel_state->compute_sampler_table.Synchornize(tsc_gpu_addr, tsc_limit)) { | 212 | if (channel_state->compute_sampler_table.Synchronize(tsc_gpu_addr, tsc_limit)) { |
| 213 | channel_state->compute_sampler_ids.resize(tsc_limit + 1, CORRUPT_ID); | 213 | channel_state->compute_sampler_ids.resize(tsc_limit + 1, CORRUPT_ID); |
| 214 | } | 214 | } |
| 215 | if (channel_state->compute_image_table.Synchornize(kepler_compute->regs.tic.Address(), | 215 | if (channel_state->compute_image_table.Synchronize(kepler_compute->regs.tic.Address(), |
| 216 | tic_limit)) { | 216 | tic_limit)) { |
| 217 | channel_state->compute_image_view_ids.resize(tic_limit + 1, CORRUPT_ID); | 217 | channel_state->compute_image_view_ids.resize(tic_limit + 1, CORRUPT_ID); |
| 218 | } | 218 | } |