diff options
author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2014-10-23 17:44:23 +0200 |
---|---|---|
committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2015-01-27 18:11:44 +0100 |
commit | 2101685b7d5f02d05665e85c0ed6d0788a3d25f5 (patch) | |
tree | db56ddd81d4d496816ccbccb9fcacbd419984afc /tests | |
parent | 1799b362a3a824bda373f8b6e5f95de2d0a383bd (diff) | |
download | gstreamer-vaapi-2101685b7d5f02d05665e85c0ed6d0788a3d25f5.tar.gz |
texture: move to core libgstvaapi base library.
GstVaapiTexture is a generic abstraction that could be moved to the
core libgstvaapi library. While doing this, no extra dependency needs
to be added. This means that a GstVaapitextureClass is now available
for any specific code that needs to be added, e.g. creation of the
underlying GL texture objects, or backend dependent ways to upload
a surface to the texture object.
Generic OpenGL data types (GLuint, GLenum) are also replaced with a
plain guint.
https://bugzilla.gnome.org/show_bug.cgi?id=736715
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test-textures.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/test-textures.c b/tests/test-textures.c index c4673ade..63b4c784 100644 --- a/tests/test-textures.c +++ b/tests/test-textures.c @@ -23,9 +23,9 @@ #include "gst/vaapi/sysdeps.h" #include <gst/vaapi/gstvaapidisplay_glx.h> #include <gst/vaapi/gstvaapiwindow_glx.h> +#include <gst/vaapi/gstvaapitexture_glx.h> #include <gst/vaapi/gstvaapisurface.h> #include <gst/vaapi/gstvaapiimage.h> -#include <gst/vaapi/gstvaapitexture.h> #include "image.h" static inline void pause(void) @@ -89,10 +89,10 @@ main(int argc, char *argv[]) g_error("coult not bind GL context"); g_print("#\n"); - g_print("# Create texture with gst_vaapi_texture_new()\n"); + g_print("# Create texture with gst_vaapi_texture_glx_new()\n"); g_print("#\n"); { - texture = gst_vaapi_texture_new( + texture = gst_vaapi_texture_glx_new( display, GL_TEXTURE_2D, GL_RGBA, @@ -113,7 +113,7 @@ main(int argc, char *argv[]) } g_print("#\n"); - g_print("# Create texture with gst_vaapi_texture_new_with_texture()\n"); + g_print("# Create texture with gst_vaapi_texture_glx_new_wrapped()\n"); g_print("#\n"); { const GLenum target = GL_TEXTURE_2D; @@ -139,7 +139,7 @@ main(int argc, char *argv[]) ); glDisable(target); - texture = gst_vaapi_texture_new_with_texture( + texture = gst_vaapi_texture_glx_new_wrapped( display, texture_id, target, @@ -152,7 +152,7 @@ main(int argc, char *argv[]) g_error("invalid texture id"); if (gl_get_current_texture_2d() != texture_id) - g_error("gst_vaapi_texture_new_with_texture() altered texture bindings"); + g_error("gst_vaapi_texture_glx_new_wrapped() altered texture bindings"); textures[1] = texture; |