summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--NEWS2
-rw-r--r--src/cim/cim_df.c8
-rw-r--r--src/cim/cim_vg.c5
-rw-r--r--src/cim/cim_vip.c6
-rw-r--r--src/cim/cim_vop.c12
-rw-r--r--src/compat-api.h2
-rw-r--r--src/geode.h1
-rw-r--r--src/gx_accel.c2
-rw-r--r--src/gx_randr.c6
-rw-r--r--src/gx_rotate.c4
-rw-r--r--src/lx_exa.c30
-rw-r--r--src/lx_video.c1
12 files changed, 41 insertions, 38 deletions
diff --git a/NEWS b/NEWS
index c2ed479..bfcd434 100644
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,7 @@ Better compatibility with xserver-1.13, cairo-1.12 and gtk3.
very visible text corruption in many instances.
* Handle negative srcX and srcY parameters better in EXA Composite
- operations, used via the RENDER extension (Mart)
+ operations, used via the RENDER extension (Mart Raudsepp)
Handling of source picture coordinates outside actual source pixmap
area is still subpar and ignoring spec in some corner cases, but
a more specific case is improved to provide correct results in more
diff --git a/src/cim/cim_df.c b/src/cim/cim_df.c
index abf1745..d3c1149 100644
--- a/src/cim/cim_df.c
+++ b/src/cim/cim_df.c
@@ -153,8 +153,8 @@ df_configure_video_source(DF_VIDEO_SOURCE_PARAMS * video_source_odd,
/* PARAMETER - VIDEO PITCH */
pitch =
- (video_source_odd->
- y_pitch >> 3) | ((video_source_odd->uv_pitch >> 3) << 16);
+ (video_source_odd->y_pitch >> 3) | ((video_source_odd->uv_pitch >> 3) <<
+ 16);
/* PARAMETER - VIDEO FORMAT */
@@ -1031,8 +1031,8 @@ df_configure_video_cursor_color_key(DF_VIDEO_CURSOR_PARAMS * cursor_color_key)
key = READ_VID32(DF_CURSOR_COLOR_KEY) & DF_CURSOR_COLOR_KEY_ENABLE;
key =
- key | (cursor_color_key->
- key & 0xFFFFFF) | (cursor_color_key->select_color2 << 24);
+ key | (cursor_color_key->key & 0xFFFFFF) | (cursor_color_key->
+ select_color2 << 24);
WRITE_VID32(DF_CURSOR_COLOR_KEY, key);
WRITE_VID32(DF_CURSOR_COLOR_MASK, (cursor_color_key->mask & 0xFFFFFF));
diff --git a/src/cim/cim_vg.c b/src/cim/cim_vg.c
index bc429cb..784519d 100644
--- a/src/cim/cim_vg.c
+++ b/src/cim/cim_vg.c
@@ -897,9 +897,8 @@ vg_set_custom_mode(VG_DISPLAY_MODE * mode_params, int bpp)
if ((mode_params->flags & VG_MODEFLAG_BANDWIDTHMASK) ==
VG_MODEFLAG_HIGH_BAND || ((mode_params->flags & VG_MODEFLAG_INTERLACED)
- && (mode_params->
- flags & VG_MODEFLAG_INT_MASK) ==
- VG_MODEFLAG_INT_FLICKER) ||
+ && (mode_params->flags & VG_MODEFLAG_INT_MASK)
+ == VG_MODEFLAG_INT_FLICKER) ||
(irq_ctl & DC3_IRQFILT_GFX_FILT_EN)) {
/* HIGH BANDWIDTH */
/* Set agressive watermarks and disallow forced low priority */
diff --git a/src/cim/cim_vip.c b/src/cim/cim_vip.c
index 9ecfad3..a88b65f 100644
--- a/src/cim/cim_vip.c
+++ b/src/cim/cim_vip.c
@@ -794,8 +794,7 @@ vip_set_priority_characteristics(VIPPRIORITYBUFFER * buffer)
VIP_MSR_MCR_SECOND_PRIORITY_SHIFT) &
VIP_MSR_MCR_SECOND_PRIORITY_MASK;
q_word.low |=
- (buffer->
- primary << VIP_MSR_MCR_PRIMARY_PRIORITY_SHIFT) &
+ (buffer->primary << VIP_MSR_MCR_PRIMARY_PRIORITY_SHIFT) &
VIP_MSR_MCR_PRIMARY_PRIORITY_MASK;
q_word.low |= (buffer->pid << VIP_MSR_MCR_PID_SHIFT) & VIP_MSR_MCR_PID_MASK;
@@ -922,8 +921,7 @@ vip_set_subwindow_enable(VIPSUBWINDOWBUFFER * buffer)
WRITE_VIP32(VIP_VERTICAL_START_STOP, ((buffer->stop <<
VIP_VSTART_VERTEND_SHIFT) &
VIP_VSTART_VERTEND_MASK) |
- ((buffer->
- start << VIP_VSTART_VERTSTART_SHIFT) &
+ ((buffer->start << VIP_VSTART_VERTSTART_SHIFT) &
VIP_VSTART_VERTSTART_MASK));
/* ENABLE IN THE CONTROL REGISTER */
diff --git a/src/cim/cim_vop.c b/src/cim/cim_vop.c
index fe73e98..5a85998 100644
--- a/src/cim/cim_vop.c
+++ b/src/cim/cim_vop.c
@@ -101,17 +101,13 @@ vop_set_vbi_window(VOPVBIWINDOWBUFFER * buffer)
WRITE_REG32(DC3_VBI_LN_ODD, ((buffer->odd_line_offset <<
DC3_VBI_ODD_LINE_SHIFT) &
- DC3_VBI_ODD_LINE_MASK) | (buffer->
- odd_line_capture_mask
- &
- DC3_VBI_ODD_ENABLE_MASK));
+ DC3_VBI_ODD_LINE_MASK) |
+ (buffer->odd_line_capture_mask & DC3_VBI_ODD_ENABLE_MASK));
WRITE_REG32(DC3_VBI_LN_EVEN, ((buffer->even_line_offset <<
DC3_VBI_EVEN_LINE_SHIFT) &
- DC3_VBI_EVEN_LINE_MASK) | (buffer->
- even_line_capture_mask
- &
- DC3_VBI_EVEN_ENABLE_MASK));
+ DC3_VBI_EVEN_LINE_MASK) |
+ (buffer->even_line_capture_mask & DC3_VBI_EVEN_ENABLE_MASK));
/* PROGRAM SOURCE OFFSETS
* Start with the even offsets. Note that we always enable 16-bit VBI,
diff --git a/src/compat-api.h b/src/compat-api.h
index e296829..f8b8416 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -77,7 +77,7 @@
#define VALID_MODE_ARGS_DECL int arg, DisplayModePtr pMode, Bool Verbose, int flags
-#else /*XF86_SCRN_INTERFACE)*/
+#else /*XF86_SCRN_INTERFACE) */
#define DDC_CALL(pScrni) (pScrni)
diff --git a/src/geode.h b/src/geode.h
index b733805..ac69368 100644
--- a/src/geode.h
+++ b/src/geode.h
@@ -395,6 +395,7 @@ int GeodeGetSizeFromFB(unsigned int *);
int
+
GeodeQueryImageAttributes(ScrnInfoPtr, int id, unsigned short *w,
unsigned short *h, int *pitches, int *offsets);
diff --git a/src/gx_accel.c b/src/gx_accel.c
index 764e0db..c3b3bc4 100644
--- a/src/gx_accel.c
+++ b/src/gx_accel.c
@@ -2082,7 +2082,7 @@ GXAccelInit(ScreenPtr pScrn)
#endif
return (XAAInit(pScrn, localRecPtr));
-#else /* XF86XAA */
+#else /* XF86XAA */
return FALSE;
#endif
}
diff --git a/src/gx_randr.c b/src/gx_randr.c
index 5b83094..c0ca3b9 100644
--- a/src/gx_randr.c
+++ b/src/gx_randr.c
@@ -181,7 +181,8 @@ GXRandRSetMode(ScreenPtr pScreen,
#endif
if (pRoot)
- (*pScrni->EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, FALSE));
+ (*pScrni->
+ EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, FALSE));
if (useVirtual) {
pScrni->virtualX = pRandr->virtualX;
@@ -236,7 +237,8 @@ GXRandRSetMode(ScreenPtr pScreen,
xf86SetViewport(pScreen, 0, 0);
if (pRoot)
- (*pScrni->EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, TRUE));
+ (*pScrni->
+ EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, TRUE));
return ret;
}
diff --git a/src/gx_rotate.c b/src/gx_rotate.c
index 3f7c911..6076a40 100644
--- a/src/gx_rotate.c
+++ b/src/gx_rotate.c
@@ -152,8 +152,8 @@ GXRotate(ScrnInfoPtr pScrni, DisplayModePtr mode)
pScrni->pScreen->rootDepth,
pScrni->bitsPerPixel,
PixmapBytePad(pScrni->displayWidth,
- pScrni->pScreen->
- rootDepth),
+ pScrni->
+ pScreen->rootDepth),
(pointer) (pGeode->FBBase +
pScrni->fbOffset));
diff --git a/src/lx_exa.c b/src/lx_exa.c
index 2e0cd48..60edd1b 100644
--- a/src/lx_exa.c
+++ b/src/lx_exa.c
@@ -549,7 +549,10 @@ lx_check_composite(int op, PicturePtr pSrc, PicturePtr pMsk, PicturePtr pDst)
/* XXX - don't know if we can do any hwaccel on solid fills or gradient types in generic cases */
if (pMsk && pMsk->pSourcePict)
- GEODE_FALLBACK(("%s are not supported as a mask\n", pMsk->pSourcePict->type == SourcePictTypeSolidFill ? "Solid pictures" : "Gradients"));
+ GEODE_FALLBACK(("%s are not supported as a mask\n",
+ pMsk->pSourcePict->type ==
+ SourcePictTypeSolidFill ? "Solid pictures" :
+ "Gradients"));
if (pSrc->pSourcePict && pSrc->pSourcePict->type != SourcePictTypeSolidFill)
GEODE_FALLBACK(("Gradients are not supported as the source\n"));
@@ -612,7 +615,8 @@ lx_check_composite(int op, PicturePtr pSrc, PicturePtr pMsk, PicturePtr pDst)
int direction = (opPtr->channel == CIMGP_CHANNEL_A_SOURCE) ? 0 : 1;
/* Direction 0 indicates src->dst, 1 indicates dst->src */
- if (((direction == 0) && (pSrc->pDrawable && pSrc->pDrawable->bitsPerPixel < 16)) ||
+ if (((direction == 0) &&
+ (pSrc->pDrawable && pSrc->pDrawable->bitsPerPixel < 16)) ||
((direction == 1) && (pDst->pDrawable->bitsPerPixel < 16))) {
ErrorF("Mask blending unsupported with <16bpp\n");
return FALSE;
@@ -621,17 +625,21 @@ lx_check_composite(int op, PicturePtr pSrc, PicturePtr pMsk, PicturePtr pDst)
GEODE_FALLBACK(("Masks can be only done with a 8bpp or 4bpp depth\n"));
/* The pSrc should be 1x1 pixel if the pMsk is not zero */
- if (pSrc->pDrawable && (pSrc->pDrawable->width != 1 || pSrc->pDrawable->height != 1))
+ if (pSrc->pDrawable &&
+ (pSrc->pDrawable->width != 1 || pSrc->pDrawable->height != 1))
GEODE_FALLBACK(("pSrc should be 1x1 pixel if pMsk is not zero\n"));
/* FIXME: In lx_prepare_composite, there are no variables to record the
* one pixel source's width and height when the mask is not zero.
* That will lead to bigger region to render instead of one pixel in lx
* _do_composite, so we should fallback currently to avoid this */
/* Not an issue for solid pictures, because we'll treat it as 1x1R too */
- if (!pSrc->repeat && !(pSrc->pSourcePict && pSrc->pSourcePict->type == SourcePictTypeSolidFill)) {
+ if (!pSrc->repeat &&
+ !(pSrc->pSourcePict &&
+ pSrc->pSourcePict->type == SourcePictTypeSolidFill)) {
GEODE_FALLBACK(("FIXME: unzero mask might lead to bigger rendering region than 1x1 pixels\n"));
}
- } else {
+ }
+ else {
if (pSrc->pSourcePict)
GEODE_FALLBACK(("Solid source pictures without a mask are not supported\n"));
}
@@ -691,7 +699,8 @@ lx_prepare_composite(int op, PicturePtr pSrc, PicturePtr pMsk,
/* Get the source color */
if (pSrc->pSourcePict) {
exaScratch.srcColor = pSrc->pSourcePict->solidFill.color;
- } else {
+ }
+ else {
/* If the op is PictOpOver(or PictOpOutReverse, PictOpInReverse,
* PictOpIn, PictOpOut, PictOpOverReverse), we should get the
* ARGB32 source format */
@@ -981,12 +990,9 @@ lx_composite_onepass_special(PixmapPtr pxDst, int width, int height, int opX,
opWidth = ((opX + width) - optempX) > exaScratch.srcWidth
? exaScratch.srcWidth : ((opX + width) - optempX);
opHeight = ((opY + height) - optempY) > (exaScratch.srcHeight -
- srcY) ? (exaScratch.
- srcHeight -
- srcY) : ((opY +
- height)
- -
- optempY);
+ srcY)
+ ? (exaScratch.srcHeight - srcY) : ((opY + height)
+ - optempY);
}
else {
srcOffset = GetSrcOffset(0, 0);
diff --git a/src/lx_video.c b/src/lx_video.c
index 5dbe224..eb46cb5 100644
--- a/src/lx_video.c
+++ b/src/lx_video.c
@@ -70,6 +70,7 @@ static void LXStopVideo(ScrnInfoPtr pScrni, pointer data, Bool exit);
static void
+
LXDisplayVideo(ScrnInfoPtr pScrni, int id, short width, short height,
BoxPtr dstBox, short srcW, short srcH, short drawW, short drawH);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:33:55 +0000