mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Drop old wrapper for surface_to_global_float()

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-06-18 13:17:32 -04:00
parent cebb34ef9e
commit e4c1a5f7f3
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor.c
+5 -11
View File
@@ -274,9 +274,9 @@ weston_surface_set_color(struct weston_surface *surface,
surface->shader = &surface->compositor->solid_shader; surface->shader = &surface->compositor->solid_shader;
} }
static void WL_EXPORT void
surface_to_global_float(struct weston_surface *surface, weston_surface_to_global_float(struct weston_surface *surface,
GLfloat sx, GLfloat sy, GLfloat *x, GLfloat *y) GLfloat sx, GLfloat sy, GLfloat *x, GLfloat *y)
{ {
if (surface->transform.enabled) { if (surface->transform.enabled) {
struct weston_vector v = { { sx, sy, 0.0f, 1.0f } }; 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) { for (i = 0; i < 4; ++i) {
GLfloat x, y; 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) if (x < min_x)
min_x = x; min_x = x;
if (x > max_x) if (x > max_x)
@@ -444,13 +445,6 @@ weston_surface_update_transform(struct weston_surface *surface)
weston_compositor_schedule_repaint(surface->compositor); weston_compositor_schedule_repaint(surface->compositor);
} }
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 WL_EXPORT void
weston_surface_to_global_fixed(struct weston_surface *surface, weston_surface_to_global_fixed(struct weston_surface *surface,
wl_fixed_t sx, wl_fixed_t sy, wl_fixed_t sx, wl_fixed_t sy,