commit 952b6c80040a258b8b0e75fef16fb564d4ff0c2c
author Pekka Paalanen <pekka.paalanen@collabora.co.uk> Fri Mar 14 14:38:15 2014 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Tue Apr 01 16:46:40 2014 -0700
tree 63f8df73e65689efac7e5fd799986411ea224e98
parent 7ed251c11910c315fcf2d0f4cef7e07894410464

compositor: reorganize struct weston_buffer_viewport

Queueing in the Presentation extension requires splitting the viewport
state into buffer state and surface state. To conveniently allow
assigning only one, the other, or both, reorganize the
weston_buffer_viewport structure.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

src/pixman-renderer.c

diff --git a/src/pixman-renderer.c b/src/pixman-renderer.c
index e9e907e..41738a6 100644
--- a/src/pixman-renderer.c
+++ b/src/pixman-renderer.c
@@ -147,6 +147,7 @@
 		(struct pixman_renderer *) output->compositor->renderer;
 	struct pixman_surface_state *ps = get_surface_state(ev->surface);
 	struct pixman_output_state *po = get_output_state(output);
+	struct weston_buffer_viewport *vp = &ev->surface->buffer_viewport;
 	pixman_region32_t final_region;
 	float view_x, view_y;
 	pixman_transform_t transform;
@@ -257,17 +258,17 @@
 					   pixman_double_to_fixed ((double)-ev->geometry.y));
 	}
 
-	if (ev->surface->buffer_viewport.viewport_set) {
+	if (vp->buffer.viewport_set) {
 		double viewport_x, viewport_y, viewport_width, viewport_height;
 		double ratio_x, ratio_y;
 
-		viewport_x = wl_fixed_to_double(ev->surface->buffer_viewport.src_x);
-		viewport_y = wl_fixed_to_double(ev->surface->buffer_viewport.src_y);
-		viewport_width = wl_fixed_to_double(ev->surface->buffer_viewport.src_width);
-		viewport_height = wl_fixed_to_double(ev->surface->buffer_viewport.src_height);
+		viewport_x = wl_fixed_to_double(vp->buffer.src_x);
+		viewport_y = wl_fixed_to_double(vp->buffer.src_y);
+		viewport_width = wl_fixed_to_double(vp->buffer.src_width);
+		viewport_height = wl_fixed_to_double(vp->buffer.src_height);
 
-		ratio_x = viewport_width / ev->surface->buffer_viewport.dst_width;
-		ratio_y = viewport_height / ev->surface->buffer_viewport.dst_height;
+		ratio_x = viewport_width / vp->surface.width;
+		ratio_y = viewport_height / vp->surface.height;
 
 		pixman_transform_scale(&transform, NULL,
 				       pixman_double_to_fixed(ratio_x),
@@ -279,7 +280,7 @@
 	fw = pixman_int_to_fixed(ev->surface->width);
 	fh = pixman_int_to_fixed(ev->surface->height);
 
-	switch (ev->surface->buffer_viewport.transform) {
+	switch (vp->buffer.transform) {
 	case WL_OUTPUT_TRANSFORM_FLIPPED:
 	case WL_OUTPUT_TRANSFORM_FLIPPED_90:
 	case WL_OUTPUT_TRANSFORM_FLIPPED_180:
@@ -291,7 +292,7 @@
 		break;
 	}
 
-	switch (ev->surface->buffer_viewport.transform) {
+	switch (vp->buffer.transform) {
 	default:
 	case WL_OUTPUT_TRANSFORM_NORMAL:
 	case WL_OUTPUT_TRANSFORM_FLIPPED:
@@ -314,12 +315,12 @@
 	}
 
 	pixman_transform_scale(&transform, NULL,
-			       pixman_double_to_fixed(ev->surface->buffer_viewport.scale),
-			       pixman_double_to_fixed(ev->surface->buffer_viewport.scale));
+			       pixman_double_to_fixed(vp->buffer.scale),
+			       pixman_double_to_fixed(vp->buffer.scale));
 
 	pixman_image_set_transform(ps->image, &transform);
 
-	if (ev->transform.enabled || output->current_scale != ev->surface->buffer_viewport.scale)
+	if (ev->transform.enabled || output->current_scale != vp->buffer.scale)
 		pixman_image_set_filter(ps->image, PIXMAN_FILTER_BILINEAR, NULL, 0);
 	else
 		pixman_image_set_filter(ps->image, PIXMAN_FILTER_NEAREST, NULL, 0);