[uxa] Remove unused pixmap size limits.
All size-related rendering limits should be managed by the driver in the pixmap_is_offscreen call. There's no need for uxa to even know these values.
This commit is contained in:
parent
68f0872db6
commit
fc3e287e6b
|
|
@ -720,9 +720,6 @@ i830_uxa_init (ScreenPtr pScreen)
|
|||
i830->uxa_driver->uxa_major = 1;
|
||||
i830->uxa_driver->uxa_minor = 0;
|
||||
|
||||
i830->uxa_driver->max_x = i830->accel_max_x;
|
||||
i830->uxa_driver->max_y = i830->accel_max_y;
|
||||
|
||||
/* Solid fill */
|
||||
i830->uxa_driver->prepare_solid = I830EXAPrepareSolid;
|
||||
i830->uxa_driver->solid = I830EXASolid;
|
||||
|
|
|
|||
14
uxa/uxa.c
14
uxa/uxa.c
|
|
@ -408,20 +408,6 @@ uxa_driver_init(ScreenPtr screen, uxa_driver_t *uxa_driver)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
/* If the driver doesn't set any max pitch values, we'll just assume
|
||||
* that there's a limitation by pixels, and that it's the same as
|
||||
* maxX.
|
||||
*
|
||||
* We want max_pitch_pixels or max_pitch_bytes to be set so we can check
|
||||
* pixmaps against the max pitch in uxaCreatePixmap() -- it matters
|
||||
* whether a pixmap is rejected because of its pitch or
|
||||
* because of its width.
|
||||
*/
|
||||
if (!uxa_driver->max_pitch_pixels && !uxa_driver->max_pitch_bytes)
|
||||
{
|
||||
uxa_driver->max_pitch_pixels = uxa_driver->max_x;
|
||||
}
|
||||
|
||||
#ifdef RENDER
|
||||
ps = GetPictureScreenIfSet(screen);
|
||||
#endif
|
||||
|
|
|
|||
50
uxa/uxa.h
50
uxa/uxa.h
|
|
@ -68,26 +68,6 @@ typedef struct _UxaDriver {
|
|||
*/
|
||||
int flags;
|
||||
|
||||
/** @{ */
|
||||
/**
|
||||
* max_x controls the X coordinate limitation for rendering from the card.
|
||||
* The driver should never receive a request for rendering beyond max_x
|
||||
* in the X direction from the origin of a pixmap.
|
||||
*/
|
||||
int max_x;
|
||||
|
||||
/**
|
||||
* max_y controls the Y coordinate limitation for rendering from the card.
|
||||
* The driver should never receive a request for rendering beyond max_y
|
||||
* in the Y direction from the origin of a pixmap.
|
||||
*/
|
||||
int max_y;
|
||||
/** @} */
|
||||
|
||||
/* private */
|
||||
Bool needsSync;
|
||||
int lastMarker;
|
||||
|
||||
/** @name solid
|
||||
* @{
|
||||
*/
|
||||
|
|
@ -510,36 +490,6 @@ typedef struct _UxaDriver {
|
|||
*/
|
||||
Bool (*pixmap_is_offscreen)(PixmapPtr pPix);
|
||||
|
||||
/**
|
||||
* max_pitch_pixels controls the pitch limitation for rendering from
|
||||
* the card.
|
||||
* The driver should never receive a request for rendering a pixmap
|
||||
* that has a pitch (in pixels) beyond max_pitch_pixels.
|
||||
*
|
||||
* Setting this field is optional -- if your hardware doesn't have
|
||||
* a pitch limitation in pixels, don't set this. If neither this value
|
||||
* nor max_pitch_bytes is set, then max_pitch_pixels is set to max_x.
|
||||
* If set, it must not be smaller than max_x.
|
||||
*
|
||||
* @sa max_pitch_bytes
|
||||
*/
|
||||
int max_pitch_pixels;
|
||||
|
||||
/**
|
||||
* max_pitch_bytes controls the pitch limitation for rendering from
|
||||
* the card.
|
||||
* The driver should never receive a request for rendering a pixmap
|
||||
* that has a pitch (in bytes) beyond max_pitch_bytes.
|
||||
*
|
||||
* Setting this field is optional -- if your hardware doesn't have
|
||||
* a pitch limitation in bytes, don't set this.
|
||||
* If set, it must not be smaller than max_x * 4.
|
||||
* There's no default value for max_pitch_bytes.
|
||||
*
|
||||
* @sa max_pitch_pixels
|
||||
*/
|
||||
int max_pitch_bytes;
|
||||
|
||||
/** @} */
|
||||
} uxa_driver_t;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue