diff options
| author | 2023-03-12 13:33:31 +0800 | |
|---|---|---|
| committer | 2023-03-12 13:33:31 +0800 | |
| commit | 44f10c8dee03ca765fb1fb6557b97a3ba2e149c7 (patch) | |
| tree | 040b117c2298a3f4d0e7b9f268511d4cc53075f4 | |
| parent | video_core: Invalid index_buffer flag when inline_index draw (diff) | |
| download | yuzu-44f10c8dee03ca765fb1fb6557b97a3ba2e149c7.tar.gz yuzu-44f10c8dee03ca765fb1fb6557b97a3ba2e149c7.tar.xz yuzu-44f10c8dee03ca765fb1fb6557b97a3ba2e149c7.zip | |
video_core: Fix ogl status error when draw_texture
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_opengl/blit_image.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/blit_image.cpp b/src/video_core/renderer_opengl/blit_image.cpp index 9a560a73b..3b03e8d5a 100644 --- 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; | |||
| 22 | void BlitImageHelper::BlitColor(GLuint dst_framebuffer, GLuint src_image_view, GLuint src_sampler, | 22 | void BlitImageHelper::BlitColor(GLuint dst_framebuffer, GLuint src_image_view, GLuint src_sampler, |
| 23 | const Region2D& dst_region, const Region2D& src_region, | 23 | const Region2D& dst_region, const Region2D& src_region, |
| 24 | const Extent3D& src_size) { | 24 | const Extent3D& src_size) { |
| 25 | glEnable(GL_CULL_FACE); | 25 | glDisable(GL_CULL_FACE); |
| 26 | glDisable(GL_COLOR_LOGIC_OP); | 26 | glDisable(GL_COLOR_LOGIC_OP); |
| 27 | glDisable(GL_DEPTH_TEST); | 27 | glDisable(GL_DEPTH_TEST); |
| 28 | glDisable(GL_STENCIL_TEST); | 28 | glDisable(GL_STENCIL_TEST); |
| @@ -31,7 +31,6 @@ void BlitImageHelper::BlitColor(GLuint dst_framebuffer, GLuint src_image_view, G | |||
| 31 | glDisable(GL_ALPHA_TEST); | 31 | glDisable(GL_ALPHA_TEST); |
| 32 | glDisablei(GL_BLEND, 0); | 32 | glDisablei(GL_BLEND, 0); |
| 33 | glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); | 33 | glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); |
| 34 | glCullFace(GL_BACK); | ||
| 35 | glFrontFace(GL_CW); | 34 | glFrontFace(GL_CW); |
| 36 | glColorMaski(0, GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); | 35 | glColorMaski(0, GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); |
| 37 | glDepthRangeIndexed(0, 0.0, 0.0); | 36 | 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 7bced675c..b71475a5d 100644 --- 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() { | |||
| 357 | .y = static_cast<s32>(draw_texture_state.src_y1)}}; | 357 | .y = static_cast<s32>(draw_texture_state.src_y1)}}; |
| 358 | blit_image.BlitColor(texture_cache.GetFramebuffer()->Handle(), texture.DefaultHandle(), | 358 | blit_image.BlitColor(texture_cache.GetFramebuffer()->Handle(), texture.DefaultHandle(), |
| 359 | sampler->Handle(), dst_region, src_region, texture.size); | 359 | sampler->Handle(), dst_region, src_region, texture.size); |
| 360 | state_tracker.InvalidateState(); | ||
| 360 | } | 361 | } |
| 361 | 362 | ||
| 362 | ++num_queued_commands; | 363 | ++num_queued_commands; |