diff options
| -rw-r--r-- | src/core/hle/result.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 3 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/main.ui | 1 |
5 files changed, 4 insertions, 6 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 3ebf7aadf..c6b18cfba 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -227,7 +227,7 @@ public: } } - ResultVal(ResultVal&& o) : result_code(o.result_code) { + ResultVal(ResultVal&& o) noexcept : result_code(o.result_code) { if (!o.empty()) { new (&object) T(std::move(o.object)); } diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index fddfb2d83..f014183b8 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -211,7 +211,6 @@ std::pair<u8*, GLintptr> RasterizerOpenGL::SetupShaders(u8* buffer_ptr, GLintptr buffer_ptr += sizeof(ubo); buffer_offset += sizeof(ubo); - const Tegra::GPUVAddr addr{gpu.regs.code_address.CodeAddress() + shader_config.offset}; Shader shader{shader_cache.GetStageProgram(program)}; switch (program) { @@ -459,7 +458,6 @@ void RasterizerOpenGL::DrawArrays() { // Draw the vertex batch const bool is_indexed = accelerate_draw == AccelDraw::Indexed; const u64 index_buffer_size{regs.index_array.count * regs.index_array.FormatSizeInBytes()}; - const unsigned vertex_num{is_indexed ? regs.index_array.count : regs.vertex_buffer.count}; state.draw.vertex_buffer = stream_buffer.GetHandle(); state.Apply(); diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 3c3d1d35e..326a901ba 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp @@ -14,9 +14,8 @@ namespace OpenGL { /// Gets the address for the specified shader stage program static Tegra::GPUVAddr GetShaderAddress(Maxwell::ShaderProgram program) { auto& gpu = Core::System::GetInstance().GPU().Maxwell3D(); - - GLShader::ProgramCode program_code(GLShader::MAX_PROGRAM_CODE_LENGTH); auto& shader_config = gpu.regs.shader_config[static_cast<size_t>(program)]; + return gpu.regs.code_address.CodeAddress() + shader_config.offset; } diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 9ca1626d1..ffa9f72aa 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -893,6 +893,7 @@ void GMainWindow::OnStartGame() { ui.action_Pause->setEnabled(true); ui.action_Stop->setEnabled(true); + ui.action_Restart->setEnabled(true); } void GMainWindow::OnPauseGame() { @@ -901,7 +902,6 @@ void GMainWindow::OnPauseGame() { ui.action_Start->setEnabled(true); ui.action_Pause->setEnabled(false); ui.action_Stop->setEnabled(true); - ui.action_Restart->setEnabled(true); } void GMainWindow::OnStopGame() { diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui index d4c26b80a..faa0c626a 100644 --- a/src/yuzu/main.ui +++ b/src/yuzu/main.ui @@ -74,6 +74,7 @@ <addaction name="action_Start"/> <addaction name="action_Pause"/> <addaction name="action_Stop"/> + <addaction name="action_Restart"/> <addaction name="separator"/> <addaction name="action_Configure"/> </widget> |