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

diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c
index f214796..42483fb 100644 (file)
--- a/gst-libs/gst/gl/gstgldisplay.c
+++ b/gst-libs/gst/gl/gstgldisplay.c
@@ -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_draw (void);
 void gst_gl_display_on_close (void);
-void gst_gl_display_glgen_texture (GstGLDisplay* display, guint* pTexture);
-void gst_gl_display_gldel_texture (GstGLDisplay* display, guint* pTexture);
+void gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture);
+void gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture);
 GLhandleARB gst_gl_display_load_fragment_shader (gchar* textFProgram);
 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)
     {
         //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);
 
@@ -1220,7 +1220,7 @@ static void
 gst_gl_display_thread_gen_fbo (GstGLDisplay *display)
 {
     //a texture must be attached to the FBO
-    guint fake_texture = 0;
+    GLuint fake_texture = 0;
 
     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
  * Called in the gl thread */
 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
     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
  * Called in the gl thread */
 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
     //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 PHandle = 0;
     gchar s[32768];
-    gint i = 0;
+    GLint i = 0;
 
     //Set up program objects
     PHandle = glCreateProgramObjectARB ();
@@ -1749,7 +1749,7 @@ gst_gl_display_redisplay (GstGLDisplay* display, GLuint texture, gint width , gi
 
 /* Called by gst_gl_buffer_new */
 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_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 */
 void
-gst_gl_display_del_texture (GstGLDisplay* display, guint texture)
+gst_gl_display_del_texture (GstGLDisplay* display, GLuint texture)
 {
     gst_gl_display_lock (display);
     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 */
 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,
                           gpointer data)
 {
@@ -1839,7 +1839,7 @@ gst_gl_display_do_download (GstGLDisplay* display, GLuint texture,
 /* Called by gltestsrc and glfilter */
 void
 gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height,
-                        guint* fbo, guint* depthbuffer)
+                        GLuint* fbo, GLuint* depthbuffer)
 {
     gst_gl_display_lock (display);
     display->gen_fbo_width = width;
@@ -1855,8 +1855,8 @@ gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height,
 /* Called by glfilter */
 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,
-                        gint input_texture_width, gint input_texture_height, guint input_texture,
+                        GLuint fbo, GLuint depth_buffer, GLuint texture_fbo, GLCB cb,
+                        gint input_texture_width, gint input_texture_height, GLuint input_texture,
                         gdouble proj_param1, gdouble proj_param2,
                         gdouble proj_param3, gdouble proj_param4,
                         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 */
 void
-gst_gl_display_del_fbo (GstGLDisplay* display, guint fbo,
-                        guint depth_buffer)
+gst_gl_display_del_fbo (GstGLDisplay* display, GLuint fbo,
+                        GLuint depth_buffer)
 {
     gst_gl_display_lock (display);
     display->del_fbo = fbo;

diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h
index d22296b..e0cf8c7 100644 (file)
--- a/gst-libs/gst/gl/gstgldisplay.h
+++ b/gst-libs/gst/gl/gstgldisplay.h
@@ -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);
 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_del_texture (GstGLDisplay* display, guint texture);
+void gst_gl_display_gen_texture (GstGLDisplay* display, GLuint* pTexture);
+void gst_gl_display_del_texture (GstGLDisplay* display, GLuint texture);
 
 void gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format,
                                  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, 
                                gpointer data);
 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);
 
 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,
-                             guint fbo, guint depth_buffer, guint texture_fbo, GLCB cb,
-                             gint input_texture_width, gint input_texture_height, guint input_texture,
+                             GLuint fbo, GLuint depth_buffer, GLuint texture_fbo, GLCB cb,
+                             gint input_texture_width, gint input_texture_height, GLuint input_texture,
                              gdouble proj_param1, gdouble proj_param2,
                              gdouble proj_param3, gdouble proj_param4,
                              GstGLDisplayProjection projection, gpointer* stuff);
-void gst_gl_display_del_fbo (GstGLDisplay* display, guint fbo, 
-                             guint depth_buffer);
+void gst_gl_display_del_fbo (GstGLDisplay* display, GLuint fbo, 
+                             GLuint depth_buffer);
 
 void gst_gl_display_gen_shader (GstGLDisplay* display, gchar* textShader, GLhandleARB* handleShader);
 void gst_gl_display_del_shader (GstGLDisplay* display, GLhandleARB shader);

diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h
index ba23081..8dbcc86 100644 (file)
--- a/gst-libs/gst/gl/gstglfilter.h
+++ b/gst-libs/gst/gl/gstglfilter.h
@@ -57,8 +57,8 @@ struct _GstGLFilter
 
     gint width;
     gint height;
-    guint fbo;
-    guint depthbuffer;
+    GLuint fbo;
+    GLuint depthbuffer;
 };
 
 struct _GstGLFilterClass

diff --git a/gst/gl/gstgltestsrc.h b/gst/gl/gstgltestsrc.h
index b7d5185..f4f8628 100644 (file)
--- a/gst/gl/gstgltestsrc.h
+++ b/gst/gl/gstgltestsrc.h
@@ -96,8 +96,8 @@ struct _GstGLTestSrc {
     gint rate_numerator;
     gint rate_denominator;
 
-    guint fbo;
-    guint depthbuffer;
+    GLuint fbo;
+    GLuint depthbuffer;
 
     GstGLBuffer* buffer;