From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 3 Aug 2018 16:07:07 +0000 (+0200)
Subject: Remove some redundant glUseProgram() calls.
X-Git-Tag: 1.8.0~76^2~141
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=69419970bbb34fdb8a1aa6122d350ce5b602c0fd;p=nageru

Remove some redundant glUseProgram() calls.
---

diff --git a/flow.cpp b/flow.cpp
index 512bdaf..726e74f 100644
--- a/flow.cpp
+++ b/flow.cpp
@@ -379,7 +379,6 @@ void GrayscaleConversion::exec(GLint tex, GLint gray_tex, int width, int height)
 	glViewport(0, 0, width, height);
 	fbos.render_to(gray_tex);
 	glBindVertexArray(gray_vao);
-	glUseProgram(gray_program);
 	glDisable(GL_BLEND);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
@@ -422,7 +421,6 @@ void Sobel::exec(GLint tex0_view, GLint grad0_tex, int level_width, int level_he
 
 	glViewport(0, 0, level_width, level_height);
 	fbos.render_to(grad0_tex);
-	glUseProgram(sobel_program);
 	glDisable(GL_BLEND);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
@@ -472,7 +470,6 @@ void MotionSearch::exec(GLuint tex0_view, GLuint tex1_view, GLuint grad0_tex, GL
 
 	glViewport(0, 0, width_patches, height_patches);
 	fbos.render_to(flow_out_tex);
-	glUseProgram(motion_search_program);
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }
 
@@ -1448,7 +1445,6 @@ void Blend::exec(GLuint tex0, GLuint tex1, GLuint flow_tex, GLuint output_tex, i
 
 	glViewport(0, 0, level_width, level_height);
 	fbos.render_to(output_tex);
-	glUseProgram(blend_program);
 	glDisable(GL_BLEND);  // A bit ironic, perhaps.
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 }