DRW: Remove unecessary GL calls

1 files changed, 10 insertions, 6 deletions

diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 3180cf5c459..e99d95282a0 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -263,7 +263,7 @@ void drw_state_set(DRWState state)
 			}
 			else {
 				glDisable(GL_BLEND);
-				glBlendFunc(GL_ONE, GL_ONE); /* Don't multiply incoming color by alpha. */
+				// glBlendFunc(GL_ONE, GL_ONE); /* Don't multiply incoming color by alpha. */
 			}
 		}
 	}
@@ -1023,8 +1023,11 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
 	release_ubo_slots(shader_changed);
 	release_texture_slots(shader_changed);
 
-	drw_state_set((pass_state & shgroup->state_extra_disable) | shgroup->state_extra);
-	drw_stencil_set(shgroup->stencil_mask);
+	/* Only set the state if there is something to draw. */
+	if (!DRW_shgroup_is_empty(shgroup)) {
+		drw_state_set((pass_state & shgroup->state_extra_disable) | shgroup->state_extra);
+		drw_stencil_set(shgroup->stencil_mask);
+	}
 
 	/* Binding Uniform */
 	for (DRWUniform *uni = shgroup->uniforms; uni; uni = uni->next) {
@@ -1234,9 +1237,6 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
 	if (use_tfeedback) {
 		GPU_shader_transform_feedback_disable(shgroup->shader);
 	}
-
-	/* TODO: remove, (currently causes alpha issue with sculpt, need to investigate) */
-	DRW_state_reset();
 }
 
 static void drw_update_view(void)
@@ -1275,6 +1275,10 @@ static void drw_draw_pass_ex(DRWPass *pass, DRWShadingGroup *start_group, DRWSha
 
 	BLI_assert(DST.buffer_finish_called && "DRW_render_instance_buffer_finish had not been called before drawing");
 
+	if (DRW_pass_is_empty(pass)) {
+		return;
+	}
+
 	drw_update_view();
 
 	drw_state_set(pass->state);