godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77946 from bruvzg/opengl_blend_cache 

[OpenGL] Fix LCD blend mode color caching.
This commit is contained in:
Rémi Verschelde 2023-06-07 11:02:30 +02:00
parent e3f446a123 a2abea8b98
commit e75285f69f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -655,6 +655,7 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
current_clip = nullptr; current_clip = nullptr;
GLES3::CanvasShaderData::BlendMode last_blend_mode = GLES3::CanvasShaderData::BLEND_MODE_MIX; GLES3::CanvasShaderData::BlendMode last_blend_mode = GLES3::CanvasShaderData::BLEND_MODE_MIX;
Color last_blend_color;
state.current_tex = RID(); state.current_tex = RID();
@ -691,8 +692,9 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
} }
GLES3::CanvasShaderData::BlendMode blend_mode = state.canvas_instance_batches[i].blend_mode; GLES3::CanvasShaderData::BlendMode blend_mode = state.canvas_instance_batches[i].blend_mode;
Color blend_color = state.canvas_instance_batches[i].blend_color;
if (last_blend_mode != blend_mode) { if (last_blend_mode != blend_mode || last_blend_color != blend_color) {
if (last_blend_mode == GLES3::CanvasShaderData::BLEND_MODE_DISABLED) { if (last_blend_mode == GLES3::CanvasShaderData::BLEND_MODE_DISABLED) {
// re-enable it // re-enable it
glEnable(GL_BLEND); glEnable(GL_BLEND);
@ -712,7 +714,6 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
} else { } else {
glBlendFuncSeparate(GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_ZERO, GL_ONE); glBlendFuncSeparate(GL_CONSTANT_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_ZERO, GL_ONE);
} }
Color blend_color = state.canvas_instance_batches[state.current_batch_index].blend_color;
glBlendColor(blend_color.r, blend_color.g, blend_color.b, blend_color.a); glBlendColor(blend_color.r, blend_color.g, blend_color.b, blend_color.a);
} break; } break;
@ -762,6 +763,7 @@ void RasterizerCanvasGLES3::_render_items(RID p_to_render_target, int p_item_cou
} break; } break;
} }
last_blend_mode = blend_mode; last_blend_mode = blend_mode;
last_blend_color = blend_color;
} }
_render_batch(p_lights, i); _render_batch(p_lights, i);