frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Set sprite transforms from RRSetCrtcConfigs" 

This reverts commit a88d70fb20.
This commit is contained in:
Keith Packard 2011-02-23 11:17:29 -08:00
parent fd9331f6eb
commit 7b7cd3f121
4 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/modes/xf86RandR12.c
View File

@ -1819,8 +1819,8 @@ xf86RRConvertCrtcConfig(xf86CrtcSetConfigPtr xf86_config,
return FALSE;
for (o = 0; o < rr_config->numOutputs; o++)
xf86_config->outputs[o] = rr_config->outputs[o]->devPrivate;
xf86_config->sprite_position_transform = rr_config->sprite_position_f_transform;
xf86_config->sprite_image_transform = rr_config->sprite_image_f_transform;
xf86_config->sprite_position_transform = rr_config->sprite_position_transform;
xf86_config->sprite_image_transform = rr_config->sprite_image_transform;
xf86_config->pixmap = rr_config->pixmap;
xf86_config->pixmap_x = rr_config->pixmap_x;
xf86_config->pixmap_y = rr_config->pixmap_y;

23
randr/mirrcrtc.c
View File

@ -60,21 +60,14 @@ miRRSetCrtcConfig(RRCrtcConfigPtr crtc_config)
x = crtc_config->pixmap_x;
y = crtc_config->pixmap_y;
}
if (!RRCrtcSet(crtc_config->crtc,
crtc_config->mode,
x,
y,
crtc_config->rotation,
crtc_config->numOutputs,
crtc_config->outputs,
crtc_config->pixmap))
return FALSE;
RRCrtcSpriteTransformSet(crtc_config->crtc,
&crtc_config->sprite_position_transform,
&crtc_config->sprite_image_transform,
&crtc_config->sprite_position_f_transform,
&crtc_config->sprite_image_f_transform);
return TRUE;
return RRCrtcSet(crtc_config->crtc,
crtc_config->mode,
x,
y,
crtc_config->rotation,
crtc_config->numOutputs,
crtc_config->outputs,
crtc_config->pixmap);
}
Bool

6
randr/randrstr.h
View File

@ -154,10 +154,8 @@ struct _rrCrtcConfig {
Rotation rotation;
int numOutputs;
RROutputPtr *outputs;
PictTransform sprite_position_transform;
PictTransform sprite_image_transform;
struct pict_f_transform sprite_position_f_transform;
struct pict_f_transform sprite_image_f_transform;
struct pict_f_transform sprite_position_transform;
struct pict_f_transform sprite_image_transform;
PixmapPtr pixmap;
int pixmap_x, pixmap_y;
};

27
randr/rrcrtc.c
View File

@ -430,10 +430,8 @@ RRCrtcCurrentConfig(RRCrtcPtr crtc,
if (!crtc_config->outputs)
return FALSE;
memcpy(crtc_config->outputs, crtc->outputs, crtc->numOutputs * sizeof (RROutputPtr));
crtc_config->sprite_position_transform = crtc->client_sprite_position_transform;
crtc_config->sprite_image_transform = crtc->client_sprite_image_transform;
crtc_config->sprite_position_f_transform = crtc->client_sprite_f_position_transform;
crtc_config->sprite_image_f_transform = crtc->client_sprite_f_image_transform;
crtc_config->sprite_position_transform = crtc->client_sprite_f_position_transform;
crtc_config->sprite_image_transform = crtc->client_sprite_f_image_transform;
/* XXX add pixmap stuff */
crtc_config->pixmap = NULL;
@ -720,8 +718,8 @@ RRScreenCoversCrtc(RRScreenConfigPtr screen_config,
crtc_config->mode->mode.width, crtc_config->mode->mode.height,
crtc_config->rotation,
client_transform,
&crtc_config->sprite_position_f_transform,
&crtc_config->sprite_image_f_transform,
&crtc_config->sprite_position_transform,
&crtc_config->sprite_image_transform,
NULL, &f_transform, NULL, NULL, NULL, NULL);
RRModeGetScanoutSize (crtc_config->mode, &f_transform,
@ -1471,6 +1469,15 @@ ProcRRGetCrtcTransform (ClientPtr client)
return Success;
}
static void
pixman_f_transform_from_xRenderTransform(struct pixman_f_transform *f_transform,
xRenderTransform *x_transform)
{
struct pixman_transform transform;
PictTransform_from_xRenderTransform(&transform, x_transform);
pixman_f_transform_from_pixman_transform(f_transform, &transform);
}
static int
RRConvertCrtcConfig(ClientPtr client, ScreenPtr screen,
RRScreenConfigPtr screen_config,
@ -1587,14 +1594,10 @@ RRConvertCrtcConfig(ClientPtr client, ScreenPtr screen,
config->rotation = x->rotation;
config->numOutputs = x->nOutput;
config->outputs = outputs;
PictTransform_from_xRenderTransform(&config->sprite_position_transform,
pixman_f_transform_from_xRenderTransform(&config->sprite_position_transform,
&x->spritePositionTransform);
PictTransform_from_xRenderTransform(&config->sprite_image_transform,
pixman_f_transform_from_xRenderTransform(&config->sprite_image_transform,
&x->spriteImageTransform);
pixman_f_transform_from_pixman_transform(&config->sprite_position_f_transform,
&config->sprite_position_transform);
pixman_f_transform_from_pixman_transform(&config->sprite_image_f_transform,
&config->sprite_image_transform);
config->pixmap = pixmap;
config->pixmap_x = x->xPixmap;
config->pixmap_y = x->yPixmap;