mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-30 11:08:34 +00:00
[443/906] sobel: move some highly duplicated code into glfilter
Add a new convenience function in GstGLFilter that just draws an input texture to a target texture using a simple shader with just a "tex" uniform sampler. Move draw_texture from glfiltersobel to glfilter. Still need to update other plugins to this.
This commit is contained in:
parent
c390c30aac
commit
306526a19f
2 changed files with 62 additions and 1 deletions
|
@ -223,10 +223,12 @@ gst_gl_filter_reset (GstGLFilter * filter)
|
||||||
g_object_unref (filter->display);
|
g_object_unref (filter->display);
|
||||||
filter->display = NULL;
|
filter->display = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
filter->width = 0;
|
filter->width = 0;
|
||||||
filter->height = 0;
|
filter->height = 0;
|
||||||
filter->fbo = 0;
|
filter->fbo = 0;
|
||||||
filter->depthbuffer = 0;
|
filter->depthbuffer = 0;
|
||||||
|
filter->default_shader = NULL;
|
||||||
filter->external_gl_context = 0;
|
filter->external_gl_context = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,7 +254,8 @@ gst_gl_filter_start (GstBaseTransform * bt)
|
||||||
else {
|
else {
|
||||||
/* this gl filter is a sink in terms of the gl chain */
|
/* this gl filter is a sink in terms of the gl chain */
|
||||||
filter->display = gst_gl_display_new ();
|
filter->display = gst_gl_display_new ();
|
||||||
gst_gl_display_create_context (filter->display, filter->external_gl_context);
|
gst_gl_display_create_context (filter->display,
|
||||||
|
filter->external_gl_context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -442,3 +445,55 @@ gst_gl_filter_render_to_target (GstGLFilter * filter,
|
||||||
0, filter->width, 0, filter->height,
|
0, filter->width, 0, filter->height,
|
||||||
GST_GL_DISPLAY_PROJECTION_ORTHO2D, data);
|
GST_GL_DISPLAY_PROJECTION_ORTHO2D, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_draw_with_shader_cb (gint width, gint height, guint texture, gpointer stuff)
|
||||||
|
{
|
||||||
|
GstGLFilter *filter = GST_GL_FILTER (stuff);
|
||||||
|
|
||||||
|
glMatrixMode (GL_PROJECTION);
|
||||||
|
glLoadIdentity ();
|
||||||
|
|
||||||
|
gst_gl_shader_use (filter->default_shader);
|
||||||
|
|
||||||
|
glActiveTexture (GL_TEXTURE1);
|
||||||
|
glEnable (GL_TEXTURE_RECTANGLE_ARB);
|
||||||
|
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture);
|
||||||
|
glDisable (GL_TEXTURE_RECTANGLE_ARB);
|
||||||
|
|
||||||
|
gst_gl_shader_set_uniform_1i (filter->default_shader, "tex", 1);
|
||||||
|
|
||||||
|
gst_gl_filter_draw_texture (filter, texture);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* attach target to a FBO, use shader, pass input as "tex" uniform to
|
||||||
|
* the shader, render input to a quad */
|
||||||
|
void
|
||||||
|
gst_gl_filter_render_to_target_with_shader (GstGLFilter * filter,
|
||||||
|
GLuint input, GLuint target, GstGLShader * shader)
|
||||||
|
{
|
||||||
|
filter->default_shader = shader;
|
||||||
|
gst_gl_filter_render_to_target (filter, input, target, _draw_with_shader_cb,
|
||||||
|
filter);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
gst_gl_filter_draw_texture (GstGLFilter * filter, GLuint texture)
|
||||||
|
{
|
||||||
|
glActiveTexture (GL_TEXTURE0);
|
||||||
|
glEnable (GL_TEXTURE_RECTANGLE_ARB);
|
||||||
|
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture);
|
||||||
|
|
||||||
|
glBegin (GL_QUADS);
|
||||||
|
|
||||||
|
glTexCoord2f (0.0, 0.0);
|
||||||
|
glVertex2f (-1.0, -1.0);
|
||||||
|
glTexCoord2f ((gfloat) filter->width, 0.0);
|
||||||
|
glVertex2f (1.0, -1.0);
|
||||||
|
glTexCoord2f ((gfloat) filter->width, (gfloat) filter->height);
|
||||||
|
glVertex2f (1.0, 1.0);
|
||||||
|
glTexCoord2f (0.0, (gfloat) filter->height);
|
||||||
|
glVertex2f (-1.0, 1.0);
|
||||||
|
|
||||||
|
glEnd ();
|
||||||
|
}
|
||||||
|
|
|
@ -64,6 +64,8 @@ struct _GstGLFilter
|
||||||
GLuint fbo;
|
GLuint fbo;
|
||||||
GLuint depthbuffer;
|
GLuint depthbuffer;
|
||||||
|
|
||||||
|
GstGLShader *default_shader;
|
||||||
|
|
||||||
gulong external_gl_context;
|
gulong external_gl_context;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -90,7 +92,11 @@ void
|
||||||
gst_gl_filter_render_to_target (GstGLFilter *filter,
|
gst_gl_filter_render_to_target (GstGLFilter *filter,
|
||||||
GLuint input, GLuint target,
|
GLuint input, GLuint target,
|
||||||
GLCB func, gpointer data);
|
GLCB func, gpointer data);
|
||||||
|
void
|
||||||
|
gst_gl_filter_render_to_target_with_shader (GstGLFilter * filter,
|
||||||
|
GLuint input, GLuint target, GstGLShader *shader);
|
||||||
|
|
||||||
|
void gst_gl_filter_draw_texture (GstGLFilter *filter, GLuint texture);
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue