diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_core/renderer/effect/effect_info_base.h | 8 | ||||
| -rw-r--r-- | src/common/threadsafe_queue.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/service.cpp | 7 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_util.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu/loading_screen.cpp | 4 |
5 files changed, 15 insertions, 7 deletions
diff --git a/src/audio_core/renderer/effect/effect_info_base.h b/src/audio_core/renderer/effect/effect_info_base.h index 43d0589cc..8c9583878 100644 --- a/src/audio_core/renderer/effect/effect_info_base.h +++ b/src/audio_core/renderer/effect/effect_info_base.h | |||
| @@ -419,13 +419,13 @@ protected: | |||
| 419 | /// Workbuffers assigned to this effect | 419 | /// Workbuffers assigned to this effect |
| 420 | std::array<AddressInfo, 2> workbuffers{AddressInfo(CpuAddr(0), 0), AddressInfo(CpuAddr(0), 0)}; | 420 | std::array<AddressInfo, 2> workbuffers{AddressInfo(CpuAddr(0), 0), AddressInfo(CpuAddr(0), 0)}; |
| 421 | /// Aux/Capture buffer info for reading | 421 | /// Aux/Capture buffer info for reading |
| 422 | CpuAddr send_buffer_info; | 422 | CpuAddr send_buffer_info{}; |
| 423 | /// Aux/Capture buffer for reading | 423 | /// Aux/Capture buffer for reading |
| 424 | CpuAddr send_buffer; | 424 | CpuAddr send_buffer{}; |
| 425 | /// Aux/Capture buffer info for writing | 425 | /// Aux/Capture buffer info for writing |
| 426 | CpuAddr return_buffer_info; | 426 | CpuAddr return_buffer_info{}; |
| 427 | /// Aux/Capture buffer for writing | 427 | /// Aux/Capture buffer for writing |
| 428 | CpuAddr return_buffer; | 428 | CpuAddr return_buffer{}; |
| 429 | /// Parameters of this effect | 429 | /// Parameters of this effect |
| 430 | std::array<u8, sizeof(InParameterVersion2)> parameter{}; | 430 | std::array<u8, sizeof(InParameterVersion2)> parameter{}; |
| 431 | /// State of this effect used by the AudioRenderer across calls | 431 | /// State of this effect used by the AudioRenderer across calls |
diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h index f7ae9d8c2..053798e79 100644 --- a/src/common/threadsafe_queue.h +++ b/src/common/threadsafe_queue.h | |||
| @@ -39,7 +39,7 @@ public: | |||
| 39 | template <typename Arg> | 39 | template <typename Arg> |
| 40 | void Push(Arg&& t) { | 40 | void Push(Arg&& t) { |
| 41 | // create the element, add it to the queue | 41 | // create the element, add it to the queue |
| 42 | write_ptr->current = std::forward<Arg>(t); | 42 | write_ptr->current = std::move(t); |
| 43 | // set the next pointer to a new element ptr | 43 | // set the next pointer to a new element ptr |
| 44 | // then advance the write pointer | 44 | // then advance the write pointer |
| 45 | ElementPtr* new_ptr = new ElementPtr(); | 45 | ElementPtr* new_ptr = new ElementPtr(); |
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp index c64291e7f..dadaf897f 100644 --- a/src/core/hle/service/service.cpp +++ b/src/core/hle/service/service.cpp | |||
| @@ -194,13 +194,16 @@ Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session, | |||
| 194 | Kernel::HLERequestContext& ctx) { | 194 | Kernel::HLERequestContext& ctx) { |
| 195 | const auto guard = LockService(); | 195 | const auto guard = LockService(); |
| 196 | 196 | ||
| 197 | Result result = ResultSuccess; | ||
| 198 | |||
| 197 | switch (ctx.GetCommandType()) { | 199 | switch (ctx.GetCommandType()) { |
| 198 | case IPC::CommandType::Close: | 200 | case IPC::CommandType::Close: |
| 199 | case IPC::CommandType::TIPC_Close: { | 201 | case IPC::CommandType::TIPC_Close: { |
| 200 | session.Close(); | 202 | session.Close(); |
| 201 | IPC::ResponseBuilder rb{ctx, 2}; | 203 | IPC::ResponseBuilder rb{ctx, 2}; |
| 202 | rb.Push(ResultSuccess); | 204 | rb.Push(ResultSuccess); |
| 203 | return IPC::ERR_REMOTE_PROCESS_DEAD; | 205 | result = IPC::ERR_REMOTE_PROCESS_DEAD; |
| 206 | break; | ||
| 204 | } | 207 | } |
| 205 | case IPC::CommandType::ControlWithContext: | 208 | case IPC::CommandType::ControlWithContext: |
| 206 | case IPC::CommandType::Control: { | 209 | case IPC::CommandType::Control: { |
| @@ -227,7 +230,7 @@ Result ServiceFrameworkBase::HandleSyncRequest(Kernel::KServerSession& session, | |||
| 227 | ctx.WriteToOutgoingCommandBuffer(ctx.GetThread()); | 230 | ctx.WriteToOutgoingCommandBuffer(ctx.GetThread()); |
| 228 | } | 231 | } |
| 229 | 232 | ||
| 230 | return ResultSuccess; | 233 | return result; |
| 231 | } | 234 | } |
| 232 | 235 | ||
| 233 | /// Initialize Services | 236 | /// Initialize Services |
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp index f83ad0a5b..a0d9d10ef 100644 --- a/src/video_core/renderer_opengl/gl_shader_util.cpp +++ b/src/video_core/renderer_opengl/gl_shader_util.cpp | |||
| @@ -17,6 +17,7 @@ static OGLProgram LinkSeparableProgram(GLuint shader) { | |||
| 17 | glProgramParameteri(program.handle, GL_PROGRAM_SEPARABLE, GL_TRUE); | 17 | glProgramParameteri(program.handle, GL_PROGRAM_SEPARABLE, GL_TRUE); |
| 18 | glAttachShader(program.handle, shader); | 18 | glAttachShader(program.handle, shader); |
| 19 | glLinkProgram(program.handle); | 19 | glLinkProgram(program.handle); |
| 20 | glDetachShader(program.handle, shader); | ||
| 20 | if (!Settings::values.renderer_debug) { | 21 | if (!Settings::values.renderer_debug) { |
| 21 | return program; | 22 | return program; |
| 22 | } | 23 | } |
diff --git a/src/yuzu/loading_screen.cpp b/src/yuzu/loading_screen.cpp index e273744fd..e263a07a7 100644 --- a/src/yuzu/loading_screen.cpp +++ b/src/yuzu/loading_screen.cpp | |||
| @@ -147,6 +147,10 @@ void LoadingScreen::OnLoadProgress(VideoCore::LoadCallbackStage stage, std::size | |||
| 147 | ui->progress_bar->setMaximum(static_cast<int>(total)); | 147 | ui->progress_bar->setMaximum(static_cast<int>(total)); |
| 148 | previous_total = total; | 148 | previous_total = total; |
| 149 | } | 149 | } |
| 150 | // Reset the progress bar ranges if compilation is done | ||
| 151 | if (stage == VideoCore::LoadCallbackStage::Complete) { | ||
| 152 | ui->progress_bar->setRange(0, 0); | ||
| 153 | } | ||
| 150 | 154 | ||
| 151 | QString estimate; | 155 | QString estimate; |
| 152 | // If theres a drastic slowdown in the rate, then display an estimate | 156 | // If theres a drastic slowdown in the rate, then display an estimate |