summaryrefslogtreecommitdiff
path: root/clutter-gst
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2009-06-30 00:58:33 +0100
committerRobert Bragg <robert@linux.intel.com>2009-06-30 10:30:09 +0100
commitdbb8c13bd219af54fd7453d87b165839fd434a5b (patch)
tree7f6ed5e199ec3ab38fa3b92843316a900be9160e /clutter-gst
parentd3771c866d4215a644e3c539ced11475dc6c81d4 (diff)
downloadclutter-gst-dbb8c13bd219af54fd7453d87b165839fd434a5b.tar.gz
Remove some redundant glEnable/Disable (GL_FRAGMENT_PROGRAM_ARB) calls
We were calling glEnable/Disable (GL_FRAGMENT_PROGRAM_ARB) around the code that setup the arb fragment program object, but this enable is only relevent when we come to actually draw somthing, as it determines whether OpenGL should use the old fixed function pipeline or the fragment program pipeline when rasterizing.
Diffstat (limited to 'clutter-gst')
-rw-r--r--clutter-gst/clutter-gst-video-sink.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 601d08c..db6c077 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -276,15 +276,12 @@ clutter_gst_video_sink_set_fp_shader (ClutterGstVideoSink *sink,
if (!shader_src)
return;
- glEnable (GL_FRAGMENT_PROGRAM_ARB);
priv->syms.glGenProgramsARB (1, &priv->fp);
priv->syms.glBindProgramARB (GL_FRAGMENT_PROGRAM_ARB, priv->fp);
priv->syms.glProgramStringARB (GL_FRAGMENT_PROGRAM_ARB,
GL_PROGRAM_FORMAT_ASCII_ARB,
size,
(const GLbyte *)shader_src);
-
- glDisable(GL_FRAGMENT_PROGRAM_ARB);
}
#endif