compositor: Drop old wrapper for surface_to_global_float()
authorKristian Høgsberg <krh@bitplanet.net>
Mon, 18 Jun 2012 17:17:32 +0000 (13:17 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Mon, 18 Jun 2012 17:28:12 +0000 (13:28 -0400)
src/compositor.c

index d40a878..f273e86 100644 (file)
@@ -274,9 +274,9 @@ weston_surface_set_color(struct weston_surface *surface,
        surface->shader = &surface->compositor->solid_shader;
 }
 
-static void
-surface_to_global_float(struct weston_surface *surface,
-                       GLfloat sx, GLfloat sy, GLfloat *x, GLfloat *y)
+WL_EXPORT void
+weston_surface_to_global_float(struct weston_surface *surface,
+                              GLfloat sx, GLfloat sy, GLfloat *x, GLfloat *y)
 {
        if (surface->transform.enabled) {
                struct weston_vector v = { { sx, sy, 0.0f, 1.0f } };
@@ -332,7 +332,8 @@ surface_compute_bbox(struct weston_surface *surface, int32_t sx, int32_t sy,
 
        for (i = 0; i < 4; ++i) {
                GLfloat x, y;
-               surface_to_global_float(surface, s[i][0], s[i][1], &x, &y);
+               weston_surface_to_global_float(surface,
+                                              s[i][0], s[i][1], &x, &y);
                if (x < min_x)
                        min_x = x;
                if (x > max_x)
@@ -445,13 +446,6 @@ weston_surface_update_transform(struct weston_surface *surface)
 }
 
 WL_EXPORT void
-weston_surface_to_global_float(struct weston_surface *surface,
-                              GLfloat sx, GLfloat sy, GLfloat *x, GLfloat *y)
-{
-       surface_to_global_float(surface, sx, sy, x, y);
-}
-
-WL_EXPORT void
 weston_surface_to_global_fixed(struct weston_surface *surface,
                               wl_fixed_t sx, wl_fixed_t sy,
                               wl_fixed_t *x, wl_fixed_t *y)