Module Name: xsrc
Committed By: macallan
Date: Fri Sep 2 21:24:49 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb_accel.c
ffb_accel_common.c
Log Message:
move ffb_fastfill_parms to ffb_accel_common.c so the EXA code can work
without XAA
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.6 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.7
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c:1.6 Fri Aug 19 19:16:01 2016
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c Fri Sep 2 21:24:49 2016
@@ -47,14 +47,6 @@
extern void VISmoveImageRL(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind);
extern void VISmoveImageLR(unsigned char *src, unsigned char *dst, long w, long h, long skind, long dkind);
-/* Indexed by ffb resolution enum. */
-struct fastfill_parms ffb_fastfill_parms[] = {
- /* fsmall, psmall, ffh, ffw, pfh, pfw */
- { 0x00c0, 0x1400, 0x04, 0x08, 0x10, 0x50 }, /* Standard: 1280 x 1024 */
- { 0x0140, 0x2800, 0x04, 0x10, 0x10, 0xa0 }, /* High: 1920 x 1360 */
- { 0x0080, 0x0a00, 0x02, 0x08, 0x08, 0x50 }, /* Stereo: 960 x 580 */
-/*XXX*/ { 0x00c0, 0x0a00, 0x04, 0x08, 0x08, 0x50 }, /* Portrait: 1280 x 2048 XXX */
-};
void
CreatorVtChange (ScreenPtr pScreen, int enter)
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c:1.3 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c:1.4
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c:1.3 Mon Aug 22 08:28:32 2016
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel_common.c Fri Sep 2 21:24:49 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ffb_accel_common.c,v 1.3 2016/08/22 08:28:32 mrg Exp $ */
+/* $NetBSD: ffb_accel_common.c,v 1.4 2016/09/02 21:24:49 macallan Exp $ */
/*
* Copyright (C) 1998,1999,2000 Jakub Jelinek (ja...@redhat.com)
* Copyright (C) 1998 Michal Rehacek (ma...@iname.com)
@@ -43,6 +43,15 @@
#include "compiler.h"
#include "exa.h"
+/* Indexed by ffb resolution enum. */
+struct fastfill_parms ffb_fastfill_parms[] = {
+ /* fsmall, psmall, ffh, ffw, pfh, pfw */
+ { 0x00c0, 0x1400, 0x04, 0x08, 0x10, 0x50 }, /* Standard: 1280 x 1024 */
+ { 0x0140, 0x2800, 0x04, 0x10, 0x10, 0xa0 }, /* High: 1920 x 1360 */
+ { 0x0080, 0x0a00, 0x02, 0x08, 0x08, 0x50 }, /* Stereo: 960 x 580 */
+/*XXX*/ { 0x00c0, 0x0a00, 0x04, 0x08, 0x08, 0x50 }, /* Portrait: 1280 x 2048 XXX */
+};
+
void FFB_SetupTextureAttrs(FFBPtr pFfb)
{
ffb_fbcPtr ffb = pFfb->regs;
