Cool_Tools/citra-mk7
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2024-11-17 04:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic ops not being enabled in the OpenGL renderer

Browse Source
This commit is contained in:
Dwayne Slater 2017-11-08 22:50:42 -05:00
parent dc48deaecc
commit 350082ab75
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -168,6 +168,8 @@ RasterizerOpenGL::RasterizerOpenGL() : shader_dirty(true) {
glActiveTexture(TextureUnits::ProcTexDiffLUT.Enum()); glActiveTexture(TextureUnits::ProcTexDiffLUT.Enum());
glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA32F, proctex_diff_lut_buffer.handle); glTexBuffer(GL_TEXTURE_BUFFER, GL_RGBA32F, proctex_diff_lut_buffer.handle);
glEnable(GL_BLEND);
// Sync fixed function OpenGL state // Sync fixed function OpenGL state
SyncClipEnabled(); SyncClipEnabled();
SyncClipCoef(); SyncClipCoef();

5
src/video_core/renderer_opengl/gl_state.cpp
View File

@ -33,7 +33,7 @@ OpenGLState::OpenGLState() {
stencil.action_depth_pass = GL_KEEP; stencil.action_depth_pass = GL_KEEP;
stencil.action_stencil_fail = GL_KEEP; stencil.action_stencil_fail = GL_KEEP;
blend.enabled = false; blend.enabled = true;
blend.rgb_equation = GL_FUNC_ADD; blend.rgb_equation = GL_FUNC_ADD;
blend.a_equation = GL_FUNC_ADD; blend.a_equation = GL_FUNC_ADD;
blend.src_rgb_func = GL_ONE; blend.src_rgb_func = GL_ONE;
@ -148,9 +148,6 @@ void OpenGLState::Apply() const {
if (blend.enabled != cur_state.blend.enabled) { if (blend.enabled != cur_state.blend.enabled) {
if (blend.enabled) { if (blend.enabled) {
glEnable(GL_BLEND); glEnable(GL_BLEND);
cur_state.logic_op = GL_COPY;
glLogicOp(cur_state.logic_op);
glDisable(GL_COLOR_LOGIC_OP); glDisable(GL_COLOR_LOGIC_OP);
} else { } else {
glDisable(GL_BLEND); glDisable(GL_BLEND);