From 4dff9c4fb895e52d27503ec711c2a61adb541468 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Mon, 13 Mar 2023 15:51:04 +0100 Subject: [PATCH] early-access version 3454 --- README.md | 2 +- src/input_common/drivers/sdl_driver.cpp | 10 +++++----- src/video_core/engines/draw_manager.cpp | 1 + src/video_core/renderer_opengl/blit_image.cpp | 3 +-- src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 + 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0877f2f82..25b338c85 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3453. +This is the source code for early-access 3454. ## Legal Notice diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index ab0994897..76790af27 100755 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp @@ -652,24 +652,24 @@ bool SDLDriver::IsVibrationEnabled(const PadIdentifier& identifier) { } void SDLDriver::SendVibrations() { - std::vector filtered_virations{}; + std::vector filtered_vibrations{}; while (!vibration_queue.Empty()) { VibrationRequest request; vibration_queue.Pop(request); const auto joystick = GetSDLJoystickByGUID(request.identifier.guid.RawString(), static_cast(request.identifier.port)); - const auto it = std::find_if(filtered_virations.begin(), filtered_virations.end(), + const auto it = std::find_if(filtered_vibrations.begin(), filtered_vibrations.end(), [request](VibrationRequest vibration) { return vibration.identifier == request.identifier; }); - if (it == filtered_virations.end()) { - filtered_virations.push_back(std::move(request)); + if (it == filtered_vibrations.end()) { + filtered_vibrations.push_back(std::move(request)); continue; } *it = request; } - for (const auto& vibration : filtered_virations) { + for (const auto& vibration : filtered_vibrations) { const auto joystick = GetSDLJoystickByGUID(vibration.identifier.guid.RawString(), static_cast(vibration.identifier.port)); joystick->RumblePlay(vibration.vibration); diff --git a/src/video_core/engines/draw_manager.cpp b/src/video_core/engines/draw_manager.cpp index 1d22d25f1..0e94c521a 100755 --- a/src/video_core/engines/draw_manager.cpp +++ b/src/video_core/engines/draw_manager.cpp @@ -164,6 +164,7 @@ void DrawManager::DrawEnd(u32 instance_count, bool force_draw) { draw_state.index_buffer.count = static_cast(draw_state.inline_index_draw_indexes.size() / 4); draw_state.index_buffer.format = Maxwell3D::Regs::IndexFormat::UnsignedInt; + maxwell3d->dirty.flags[VideoCommon::Dirty::IndexBuffer] = true; ProcessDraw(true, instance_count); draw_state.inline_index_draw_indexes.clear(); break; diff --git a/src/video_core/renderer_opengl/blit_image.cpp b/src/video_core/renderer_opengl/blit_image.cpp index 9a560a73b..3b03e8d5a 100755 --- a/src/video_core/renderer_opengl/blit_image.cpp +++ b/src/video_core/renderer_opengl/blit_image.cpp @@ -22,7 +22,7 @@ BlitImageHelper::~BlitImageHelper() = default; void BlitImageHelper::BlitColor(GLuint dst_framebuffer, GLuint src_image_view, GLuint src_sampler, const Region2D& dst_region, const Region2D& src_region, const Extent3D& src_size) { - glEnable(GL_CULL_FACE); + glDisable(GL_CULL_FACE); glDisable(GL_COLOR_LOGIC_OP); glDisable(GL_DEPTH_TEST); glDisable(GL_STENCIL_TEST); @@ -31,7 +31,6 @@ void BlitImageHelper::BlitColor(GLuint dst_framebuffer, GLuint src_image_view, G glDisable(GL_ALPHA_TEST); glDisablei(GL_BLEND, 0); glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); - glCullFace(GL_BACK); glFrontFace(GL_CW); glColorMaski(0, GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); glDepthRangeIndexed(0, 0.0, 0.0); diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index ce2ac7d2c..de6dbc772 100755 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -357,6 +357,7 @@ void RasterizerOpenGL::DrawTexture() { .y = static_cast(draw_texture_state.src_y1)}}; blit_image.BlitColor(texture_cache.GetFramebuffer()->Handle(), texture.DefaultHandle(), sampler->Handle(), dst_region, src_region, texture.size); + state_tracker.InvalidateState(); } ++num_queued_commands;