mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

[126/906] Change some guints to GLuints because of warnings on OS/X.

Browse source
This commit is contained in:
David Schleef 2008-07-16 15:23:36 -07:00 committed by Matthew Waters
parent 50b8417097
commit a4400cf12b
4 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst-libs/gst/gl/gstgldisplay.c
View file

@ -60,8 +60,8 @@ void gst_gl_display_post_message (GstGLDisplayAction action, GstGLDisplay* displ
void gst_gl_display_on_resize(gint width, gint height); void gst_gl_display_on_resize(gint width, gint height);
void gst_gl_display_on_draw (void); void gst_gl_display_on_draw (void);
void gst_gl_display_on_close (void); void gst_gl_display_on_close (void);
void gst_gl_display_glgen_texture (GstGLDisplay* display, guint* pTexture); void gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture);
void gst_gl_display_gldel_texture (GstGLDisplay* display, guint* pTexture); void gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture);
GLhandleARB gst_gl_display_load_fragment_shader (gchar* textFProgram); GLhandleARB gst_gl_display_load_fragment_shader (gchar* textFProgram);
void gst_gl_display_check_framebuffer_status (void); void gst_gl_display_check_framebuffer_status (void);
@ -844,7 +844,7 @@ gst_gl_display_thread_init_upload (GstGLDisplay *display)
if (GLEW_EXT_framebuffer_object) if (GLEW_EXT_framebuffer_object)
{ {
//a texture must be attached to the FBO //a texture must be attached to the FBO
guint fake_texture = 0; GLuint fake_texture = 0;
g_print ("Context %d, EXT_framebuffer_object supported: yes\n", display->glutWinId); g_print ("Context %d, EXT_framebuffer_object supported: yes\n", display->glutWinId);
@ -1220,7 +1220,7 @@ static void
gst_gl_display_thread_gen_fbo (GstGLDisplay *display) gst_gl_display_thread_gen_fbo (GstGLDisplay *display)
{ {
//a texture must be attached to the FBO //a texture must be attached to the FBO
guint fake_texture = 0; GLuint fake_texture = 0;
glutSetWindow (display->glutWinId); glutSetWindow (display->glutWinId);
@ -1554,7 +1554,7 @@ void gst_gl_display_on_close (void)
/* Generate a texture if no one is available in the pool /* Generate a texture if no one is available in the pool
* Called in the gl thread */ * Called in the gl thread */
void void
gst_gl_display_glgen_texture (GstGLDisplay* display, guint* pTexture) gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture)
{ {
//check if there is a texture available in the pool //check if there is a texture available in the pool
GstGLDisplayTex* tex = g_queue_pop_head (display->texturePool); GstGLDisplayTex* tex = g_queue_pop_head (display->texturePool);
@ -1574,7 +1574,7 @@ gst_gl_display_glgen_texture (GstGLDisplay* display, guint* pTexture)
/* Delete a texture, actually the texture is just added to the pool /* Delete a texture, actually the texture is just added to the pool
* Called in the gl thread */ * Called in the gl thread */
void void
gst_gl_display_gldel_texture (GstGLDisplay* display, guint* pTexture) gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture)
{ {
//Each existing texture is destroyed only when the pool is destroyed //Each existing texture is destroyed only when the pool is destroyed
//The pool of textures is deleted in the GstGLDisplay destructor //The pool of textures is deleted in the GstGLDisplay destructor
@ -1596,7 +1596,7 @@ gst_gl_display_load_fragment_shader (gchar* textFProgram)
GLhandleARB FHandle = 0; GLhandleARB FHandle = 0;
GLhandleARB PHandle = 0; GLhandleARB PHandle = 0;
gchar s[32768]; gchar s[32768];
gint i = 0; GLint i = 0;
//Set up program objects //Set up program objects
PHandle = glCreateProgramObjectARB (); PHandle = glCreateProgramObjectARB ();
@ -1749,7 +1749,7 @@ gst_gl_display_redisplay (GstGLDisplay* display, GLuint texture, gint width , gi
/* Called by gst_gl_buffer_new */ /* Called by gst_gl_buffer_new */
void void
gst_gl_display_gen_texture (GstGLDisplay* display, guint* pTexture) gst_gl_display_gen_texture (GstGLDisplay* display, GLuint* pTexture)
{ {
gst_gl_display_lock (display); gst_gl_display_lock (display);
gst_gl_display_post_message (GST_GL_DISPLAY_ACTION_GEN_TEXTURE, display); gst_gl_display_post_message (GST_GL_DISPLAY_ACTION_GEN_TEXTURE, display);
@ -1761,7 +1761,7 @@ gst_gl_display_gen_texture (GstGLDisplay* display, guint* pTexture)
/* Called by gst_gl_buffer_finalize */ /* Called by gst_gl_buffer_finalize */
void void
gst_gl_display_del_texture (GstGLDisplay* display, guint texture) gst_gl_display_del_texture (GstGLDisplay* display, GLuint texture)
{ {
gst_gl_display_lock (display); gst_gl_display_lock (display);
display->del_texture = texture; display->del_texture = texture;
@ -1788,7 +1788,7 @@ gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format,
/* Called by the first gl element of a video/x-raw-gl flow */ /* Called by the first gl element of a video/x-raw-gl flow */
void void
gst_gl_display_do_upload (GstGLDisplay* display, guint texture, gst_gl_display_do_upload (GstGLDisplay* display, GLuint texture,
gint data_width, gint data_height, gint data_width, gint data_height,
gpointer data) gpointer data)
{ {
@ -1839,7 +1839,7 @@ gst_gl_display_do_download (GstGLDisplay* display, GLuint texture,
/* Called by gltestsrc and glfilter */ /* Called by gltestsrc and glfilter */
void void
gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height, gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height,
guint* fbo, guint* depthbuffer) GLuint* fbo, GLuint* depthbuffer)
{ {
gst_gl_display_lock (display); gst_gl_display_lock (display);
display->gen_fbo_width = width; display->gen_fbo_width = width;
@ -1855,8 +1855,8 @@ gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height,
/* Called by glfilter */ /* Called by glfilter */
void void
gst_gl_display_use_fbo (GstGLDisplay* display, gint texture_fbo_width, gint texture_fbo_height, gst_gl_display_use_fbo (GstGLDisplay* display, gint texture_fbo_width, gint texture_fbo_height,
guint fbo, guint depth_buffer, guint texture_fbo, GLCB cb, GLuint fbo, GLuint depth_buffer, GLuint texture_fbo, GLCB cb,
gint input_texture_width, gint input_texture_height, guint input_texture, gint input_texture_width, gint input_texture_height, GLuint input_texture,
gdouble proj_param1, gdouble proj_param2, gdouble proj_param1, gdouble proj_param2,
gdouble proj_param3, gdouble proj_param4, gdouble proj_param3, gdouble proj_param4,
GstGLDisplayProjection projection, gpointer* stuff) GstGLDisplayProjection projection, gpointer* stuff)
@ -1885,8 +1885,8 @@ gst_gl_display_use_fbo (GstGLDisplay* display, gint texture_fbo_width, gint text
/* Called by gltestsrc and glfilter */ /* Called by gltestsrc and glfilter */
void void
gst_gl_display_del_fbo (GstGLDisplay* display, guint fbo, gst_gl_display_del_fbo (GstGLDisplay* display, GLuint fbo,
guint depth_buffer) GLuint depth_buffer)
{ {
gst_gl_display_lock (display); gst_gl_display_lock (display);
display->del_fbo = fbo; display->del_fbo = fbo;

16
gst-libs/gst/gl/gstgldisplay.h
View file

@ -253,12 +253,12 @@ void gst_gl_display_set_visible_context (GstGLDisplay* display, gboolean visible
void gst_gl_display_resize_context (GstGLDisplay* display, gint width, gint height); void gst_gl_display_resize_context (GstGLDisplay* display, gint width, gint height);
gboolean gst_gl_display_redisplay (GstGLDisplay* display, GLuint texture, gint width, gint height); gboolean gst_gl_display_redisplay (GstGLDisplay* display, GLuint texture, gint width, gint height);
void gst_gl_display_gen_texture (GstGLDisplay* display, guint* pTexture); void gst_gl_display_gen_texture (GstGLDisplay* display, GLuint* pTexture);
void gst_gl_display_del_texture (GstGLDisplay* display, guint texture); void gst_gl_display_del_texture (GstGLDisplay* display, GLuint texture);
void gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format, void gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format,
guint gl_width, guint gl_height); guint gl_width, guint gl_height);
void gst_gl_display_do_upload (GstGLDisplay* display, guint texture, void gst_gl_display_do_upload (GstGLDisplay* display, GLuint texture,
gint data_width, gint data_height, gint data_width, gint data_height,
gpointer data); gpointer data);
void gst_gl_display_init_download (GstGLDisplay* display, GstVideoFormat video_format, void gst_gl_display_init_download (GstGLDisplay* display, GstVideoFormat video_format,
@ -268,15 +268,15 @@ void gst_gl_display_do_download (GstGLDisplay* display, GLuint texture,
gpointer data); gpointer data);
void gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height, void gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height,
guint* fbo, guint* depthbuffer); GLuint* fbo, GLuint* depthbuffer);
void gst_gl_display_use_fbo (GstGLDisplay* display, gint texture_fbo_width, gint texture_fbo_height, void gst_gl_display_use_fbo (GstGLDisplay* display, gint texture_fbo_width, gint texture_fbo_height,
guint fbo, guint depth_buffer, guint texture_fbo, GLCB cb, GLuint fbo, GLuint depth_buffer, GLuint texture_fbo, GLCB cb,
gint input_texture_width, gint input_texture_height, guint input_texture, gint input_texture_width, gint input_texture_height, GLuint input_texture,
gdouble proj_param1, gdouble proj_param2, gdouble proj_param1, gdouble proj_param2,
gdouble proj_param3, gdouble proj_param4, gdouble proj_param3, gdouble proj_param4,
GstGLDisplayProjection projection, gpointer* stuff); GstGLDisplayProjection projection, gpointer* stuff);
void gst_gl_display_del_fbo (GstGLDisplay* display, guint fbo, void gst_gl_display_del_fbo (GstGLDisplay* display, GLuint fbo,
guint depth_buffer); GLuint depth_buffer);
void gst_gl_display_gen_shader (GstGLDisplay* display, gchar* textShader, GLhandleARB* handleShader); void gst_gl_display_gen_shader (GstGLDisplay* display, gchar* textShader, GLhandleARB* handleShader);
void gst_gl_display_del_shader (GstGLDisplay* display, GLhandleARB shader); void gst_gl_display_del_shader (GstGLDisplay* display, GLhandleARB shader);

4
gst-libs/gst/gl/gstglfilter.h
View file

@ -57,8 +57,8 @@ struct _GstGLFilter
gint width; gint width;
gint height; gint height;
guint fbo; GLuint fbo;
guint depthbuffer; GLuint depthbuffer;
}; };
struct _GstGLFilterClass struct _GstGLFilterClass

4
gst/gl/gstgltestsrc.h
View file

@ -96,8 +96,8 @@ struct _GstGLTestSrc {
gint rate_numerator; gint rate_numerator;
gint rate_denominator; gint rate_denominator;
guint fbo; GLuint fbo;
guint depthbuffer; GLuint depthbuffer;
GstGLBuffer* buffer; GstGLBuffer* buffer;