Naming cleanup to make glitz-egl match egl

Remove a bunch of unused typedefs

4 files changed, 22 insertions, 45 deletions

diff --git a/src/egl/glitz-egl.h b/src/egl/glitz-egl.h
index 005732a..1b6bf8d 100644
--- a/src/egl/glitz-egl.h
+++ b/src/egl/glitz-egl.h
@@ -53,22 +53,22 @@ glitz_egl_find_config          (EGLDisplay                    egl_display,
                                 const glitz_drawable_format_t *templ,
                                 int                           count);
 
-/* glitz_egl_drawable.c */
+/* glitz_egl_surface.c */
 
 glitz_drawable_t *
-glitz_egl_create_window_surface (EGLDisplay              display,
-                                      EGLScreenMESA           screen,
-                                      glitz_drawable_format_t *format,
-                                      NativeWindowType        window,
-                                      unsigned int            width,
-                                      unsigned int            height);
+glitz_egl_create_surface (EGLDisplay              egl_display,
+                          EGLScreenMESA           egl_screen,
+                          glitz_drawable_format_t *format,
+                          EGLSurface              egl_surface,
+                          unsigned int            width,
+                          unsigned int            height);
 
 glitz_drawable_t *
-glitz_egl_create_pbuffer_surface (EGLDisplay              display,
-                                   EGLScreenMESA           screen,
-                                   glitz_drawable_format_t *format,
-                                   unsigned int            width,
-                                   unsigned int            height);
+glitz_egl_create_pbuffer_surface (EGLDisplay               egl_display,
+                                  EGLScreenMESA           egl_screen,
+                                  glitz_drawable_format_t *format,
+                                  unsigned int            width,
+                                  unsigned int            height);
 
 
 #if defined(__cplusplus) || defined(c_plusplus)
diff --git a/src/egl/glitz_egl_surface.c b/src/egl/glitz_egl_surface.c
index 4afdd7a..0aa93a5 100644
--- a/src/egl/glitz_egl_surface.c
+++ b/src/egl/glitz_egl_surface.c
@@ -117,18 +117,18 @@ glitz_egl_create_pbuffer (void                    *abstract_templ,
 }
 
 glitz_drawable_t *
-glitz_egl_create_window_surface (EGLDisplay              display,
-                                      EGLScreenMESA           screen,
-                                      glitz_drawable_format_t *format,
-                                      NativeWindowType        window,
-                                      unsigned int            width,
-                                      unsigned int            height)
+glitz_egl_create_surface (EGLDisplay              egl_display,
+                          EGLScreenMESA           egl_screen,
+                          glitz_drawable_format_t *format,
+                          EGLSurface              egl_surface,
+                          unsigned int            width,
+                          unsigned int            height)
 {
   glitz_egl_surface_t *surface;
   glitz_egl_screen_info_t *screen_info;
   glitz_egl_context_t *context;
 
-  screen_info = glitz_egl_screen_info_get (display, screen);
+  screen_info = glitz_egl_screen_info_get (egl_display, egl_screen);
   if (!screen_info)
     return NULL;
   
@@ -137,14 +137,14 @@ glitz_egl_create_window_surface (EGLDisplay              display,
     return NULL;
   
   surface = _glitz_egl_create_surface (screen_info, context, format,
-                                         window,
+                                         egl_surface,
                                          width, height);
   if (!surface)
     return NULL;
 
   return &surface->base;
 }
-slim_hidden_def(glitz_egl_create_window_surface);
+slim_hidden_def(glitz_egl_create_surface);
 
 glitz_drawable_t *
 glitz_egl_create_pbuffer_surface (EGLDisplay              display,
diff --git a/src/egl/glitz_eglext.h b/src/egl/glitz_eglext.h
index 49c2721..e31dd99 100644
--- a/src/egl/glitz_eglext.h
+++ b/src/egl/glitz_eglext.h
@@ -29,28 +29,5 @@
 #define GLITZ_EGLEXT_H_INCLUDED
 
 
-typedef glitz_function_pointer_t (* glitz_egl_get_proc_address_t)
-     (const glitz_gl_ubyte_t *);
-typedef EGLConfig *(* glitz_egl_get_configs_t)
-     (EGLDisplay egl_display, EGLScreenMESA egl_screen, int *n_elements);
-typedef int (* glitz_egl_get_config_attrib_t)
-     (EGLDisplay egl_display, EGLConfig egl_config, int attribute, int *value);
-typedef EGLSurface (* glitz_egl_create_pbuffer_t)
-     (EGLDisplay egl_display, EGLConfig egl_config, const int *attrib_list);
-typedef void (* glitz_egl_destroy_pbuffer_t)
-     (EGLDisplay egl_display, EGLSurface egl_pbuffer);
-typedef void (* glitz_egl_query_drawable_t)
-     (EGLDisplay egl_display, EGLSurface egl_surface,
-      int attribute, unsigned int *value);
-typedef EGLBoolean (* glitz_egl_make_context_current_t)
-     (EGLDisplay egl_display, EGLSurface egl_draw, EGLSurface egl_read, EGLContext egl_ctx);
-typedef EGLContext (* glitz_egl_create_new_context_t)
-     (EGLDisplay egl_display, EGLConfig egl_config, int render_type,
-      EGLContext egl_share_list, EGLBoolean direct);
-
-typedef EGLBoolean *(* glitz_egl_bind_tex_image_t)
-     (EGLDisplay egl_display, EGLSurface egl_pbuffer, int buffer);
-typedef EGLBoolean (* glitz_egl_release_tex_image_t)
-     (EGLDisplay egl_display, EGLSurface egl_pbuffer, int buffer);
 
 #endif /* GLITZ_EGLEXT_H_INCLUDED */
diff --git a/src/egl/glitz_eglint.h b/src/egl/glitz_eglint.h
index 7a61488..dc81b17 100644
--- a/src/egl/glitz_eglint.h
+++ b/src/egl/glitz_eglint.h
@@ -165,7 +165,7 @@ glitz_egl_swap_buffers (void *abstract_drawable);
 slim_hidden_proto(glitz_egl_init)
 slim_hidden_proto(glitz_egl_fini)
 slim_hidden_proto(glitz_egl_find_config)
-slim_hidden_proto(glitz_egl_create_window_surface)
+slim_hidden_proto(glitz_egl_create_surface)
 slim_hidden_proto(glitz_egl_create_pbuffer_surface)
 
 #endif /* GLITZ_EGLINT_H_INCLUDED */