From e4c1a5f7f3a05bc75f8a9e8fad61f8a08ad8dc25 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 18 Jun 2012 13:17:32 -0400 Subject: [PATCH] compositor: Drop old wrapper for surface_to_global_float() --- src/compositor.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index d40a878..f273e86 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -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) -- 2.7.4