This is a squash merge containing all the API changes, as
well as the video ABI bump.
Its been squashed to make bisection easier.
Full patch log below:
commit b202738bbf0c5a1c1172767119c2c71f1e7f8070
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Mon May 14 15:16:11 2012 -0700
xfree86: Bump video ABI to 13.0
The ABI was broken by changes to convert from screen index numbers to ScreenPtr
/ ScrnInfoPtr in various structures and function signatures.
Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d5f7d9f8d408bcad3f83277d255f25d3b0edbf3
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 10:56:57 2012 +0100
xf86: xf86ClearEntityListForScreen should take a pScrn
When adding GPU screens this make life easier.
(also fix comment, as pointed out by Alan)
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit afee8b5ab4501597ecc1ade34124d7ca227ab055
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 24 07:07:32 2012 +0100
xf86i2c: add pscrn for drivers to use
This just adds a pScrn pointer into the struct for the drivers to use
instead of scrnIndex. Mostly scrnIndex is used for logging, but some
drivers use it to lookup xf86Screens, so let them stash a pScrn instead.
Removing the scrnIndex is a bit more involved and I'm not sure its worth
the effort. Doing i2c in the X server is legacy code as far as I'm concerned.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit ea5092f1f679691d187f1eee9427e6057beec56e
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 19:25:20 2012 +0100
dix/gc: consolidate GC object creation in one place
The standard GC create and scratch GC create were 90% the same really,
and I have a need in the future for creating GC objects without the
other bits, so wanted to avoid a third copy.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3d91482ea9b4883e64e496f2768168e0ffa21ba1
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 10:24:06 2012 +0100
xf86: add a define to denote the new non-index interfaces are being used
This can be used by drivers to provide compatible APIs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 37c3ae3e6cd4f3dedc72f371096d6743f8f99df3
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 15:09:12 2012 +0100
dix: make Create/Free scratch pixmaps take a ScreenPtr
While technically an API/ABI change I doubt anyone uses it,
but it helps in splitting screens up.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 75f2062a3fe94f04764ecc7d2ff2fbbeccb9da60
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:57:55 2012 +0100
xf86/xv: remove scrnIndexfrom xf86FindXvOptions.
Move this interface to taking an ScrnInfoPtr.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit f80c2374f40ea7b2ee0556e2e76cc07406f3d843
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:53:59 2012 +0100
xf86: make xf86DeleteScreen take a ScrnInfoPtr (v2)
stop passing indices into this function.
v2: drop flags argument.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 58824e414f35682435f15bfe6c4b656bd90b9235
Author: Dave Airlie <airlied@redhat.com>
Date: Wed May 23 14:48:09 2012 +0100
xf86: fix xf86IsScreenPrimary interface to take a pScrn (API/ABI)
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 6b4fc1f9d391bcdf7ca288766e49bce60f4635cd
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:18:59 2012 +0100
xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API) (v2)
Instead of passing an index, pass the actual ScreenPtr. This allows
more moving towards not abusing xf86Screens + screenInfo.
v2: drop the blockData/wakeupData args as per ajax's suggestion.,
fix docs.
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 790d003de20fb47674420a24dadd92412d78620d
Author: Dave Airlie <airlied@gmail.com>
Date: Wed Apr 11 09:53:14 2012 +0100
xf86/common: remove some more pScrn->pScreen uses
remove some more conversions that appeared after api cleanups.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aac85e18d1dd093f2cad6bd29375e40bd7af0b8f
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:34:53 2012 +0100
ddc: change API to take ScrnInfoPtr (v2)
This removes all xf86Screens usage from ddc code,
it modifies the API for some functions to avoid taking indices.
v2: address Alan's comments about dropping DDC2Init parameter.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit fe3f57b6eaf6860a33876a54f9439f69578f03a5
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:31:26 2012 +0100
vbe: don't use index for VBEInterpretPanelID (API)
Remove use of xf86screens from vbe module.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit abf1965f4ed91529036d3fdb470d6a3ce6f29675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 16:25:11 2012 +0100
int10/vbe: don't use xf86Screens. (ABI) (v3)
Pass the ScrnInfoPtr instead of the index in the int10 struct.
This saves us using it to dereference xf86Screens.
v2: address Alan's comment to fix struct alignment.
v3: squash in all the int10 fixes, test the vm86 code builds,
after comments by Keith.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 23cca612b4fb5efc33683c7624b803b457387e3d
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:30:18 2012 +0100
xserver: drop index argument to ScreenInit (ABI/API) (v2)
This drops the index argument, its the same as pScreen->myNum,
and its the last major index abuse I can find.
v2: address Alan's review - update docs, fix xwin/xnest/darwin
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 40d360e2d7e832407f3ed64e3a02c27ecc89a960
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:23:01 2012 +0100
xf86: migrate PointerMoved from index to ScrnInfoPtr (ABI/API)
This migrates PointerMoved from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit aa60a2f38679d0eeb979a9c2648c9bc771409bf9
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:20:46 2012 +0100
xf86: migrate PMEvent to a ScrnInfoPtr (ABI/API)
This migrates the PMEvent from index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d3f28ef44371ed4a039ffc5dd7eb6408d1269ba2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:18:30 2012 +0100
xf86: migrate SetDGAMode from index to ScrnInfoPtr (ABI/API)
This migrates the SetDGAMode callback from an index to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit baf5e4818a74f2b68c3dfdcc56f54322351039a0
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:14:11 2012 +0100
xf86: migrate ChangeGamma from index to ScrnInfoPtr (ABI/API) (v2)
This migrates the ChangeGamma interface to avoid passing a index.
v2: fix xf86RandR12.c + xf86cmap.c call
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 51e5f90ada929d6b23176090badbb42fdb3fa550
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:11:09 2012 +0100
xf86/exa: migrate index to screen types for EnableDisableFBAccess (ABI/API)
The EXA interface migrates to ScreenPtr,
and the xf86 interface migrated to ScrnInfoPtr.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 94f1f21d17e86f96d4a54292a399160950087675
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 15:02:11 2012 +0100
xf86: migrate ValidMode callback to ScrnInfoPtr (ABI/API)
This migrates the ValidMode to passing a ScrnInfoPtr instead
of an index.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 3f8f18198fed4f39ec805b508a3482e91eea26b2
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:59:46 2012 +0100
xf86: migrate SwitchMode to taking ScrnInfoPtr (ABI/API) (v2)
This migrate the SwitchMode interface to take a ScrnInfoPtr
instead of an index.
v2: drop flags.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit d06a038a5c49328ab3a8d969d24f9fcd22c63202
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:50:37 2012 +0100
xf86: move AdjustFrame to passing ScrnInfoPtr (ABI/API) (v2)
This converts AdjustFrame code paths to passing a ScrnInfoPtr
instead of an integer index.
v2: drop flags args.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 53d2f8608ffd4090d08e7d5cf2e92fb954959b90
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:41:27 2012 +0100
xf86: modify FreeScreen callback to take pScrn instead of index. (ABI/API) (v2)
Another index->pScrn conversion.
v2: drop flags arg.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 60db37c0b247052e0f5c54b1921fe58a3609c2e3
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:35:41 2012 +0100
xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break) (v2)
This modifies the EnterVT/LeaveVT interfaces to take a ScrnInfoPtr
instead of an index into xf86Screens. This allows dropping more
public dereferences of the xf86Screens and screenInfo.
v2: drop flags args as suggested by Keith, fix docs.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
commit 06729dbbc804a20242e6499f446acb5d94023c3c
Author: Dave Airlie <airlied@gmail.com>
Date: Tue Apr 10 14:04:59 2012 +0100
xserver: remove index from CloseScreen (API/ABI breakage)
This drops the index from the CloseScreen callback,
its always been useless really, since the pScreen contains it.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:
-bap
-psl
-T PrivatePtr
-T pmWait
-T _XFUNCPROTOBEGIN
-T _XFUNCPROTOEND
-T _X_EXPORT
The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.
The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.
The comparison was done with this script:
dir1=$1
dir2=$2
for dir in $dir1 $dir2; do
(cd $dir && find . -name '*.o' | while read file; do
dir=`dirname $file`
base=`basename $file .o`
dump=$dir/$base.dump
objdump -d $file > $dump
done)
done
find $dir1 -name '*.dump' | while read dump; do
otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
diff -u $dump $otherdump
done
Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Report to find out all non-UTF-8 files created by
cat extensions |xargs -I XXXX find . -name \*.XXXX |while read FILE ; do
if ( iconv -f utf8 -t ucs2 $FILE >/dev/null 2>/dev/null ) ; then
/bin/true
else
echo $FILE
fi
done >>report
Signed-off-by: Matěj Cepl <mcepl@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
[Daniel: git am failed for me, so I redid it. The method listed in the
commit message also failed, so I just used file/grep/iconv. The
results are the same though.]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
There's no use for the values set through the various macro calls
(fbGetDrawable and fbGetDrawablePixmap), so mark those variables as unused.
The following warnings go away accordingly:
| CC shpacked.lo
| shpacked.c: In function 'shadowUpdatePacked':
| shpacked.c:55:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shpacked.c:55:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar8.lo
| shplanar8.c: In function 'shadowUpdatePlanar4x8':
| shplanar8.c:105:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar8.c:105:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar.lo
| shplanar.c: In function 'shadowUpdatePlanar4':
| shplanar.c:101:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar.c:101:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_180.lo
| In file included from shrot16pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270.lo
| In file included from shrot16pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270YX.lo
| In file included from shrot16pack_270YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_270YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90.lo
| In file included from shrot16pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90YX.lo
| In file included from shrot16pack_90YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_90YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack.lo
| In file included from shrot16pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate16':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_180.lo
| In file included from shrot32pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_270.lo
| In file included from shrot32pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_90.lo
| In file included from shrot32pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack.lo
| In file included from shrot32pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate32':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_180.lo
| In file included from shrot8pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_270.lo
| In file included from shrot8pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_90.lo
| In file included from shrot8pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack.lo
| In file included from shrot8pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate8':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrotate.lo
| shrotate.c: In function 'shadowUpdateRotatePacked':
| shrotate.c:62:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotate.c:62:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shpacked.lo
| shpacked.c: In function 'shadowUpdatePacked':
| shpacked.c:55:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shpacked.c:55:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar8.lo
| shplanar8.c: In function 'shadowUpdatePlanar4x8':
| shplanar8.c:105:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar8.c:105:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shplanar.lo
| shplanar.c: In function 'shadowUpdatePlanar4':
| shplanar.c:101:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shplanar.c:101:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_180.lo
| In file included from shrot16pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270.lo
| In file included from shrot16pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_270YX.lo
| In file included from shrot16pack_270YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_270YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90.lo
| In file included from shrot16pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate16_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack_90YX.lo
| In file included from shrot16pack_90YX.c:31:0:
| shrotpackYX.h: In function 'shadowUpdateRotate16_90YX':
| shrotpackYX.h:72:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpackYX.h:72:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot16pack.lo
| In file included from shrot16pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate16':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_180.lo
| In file included from shrot32pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_270.lo
| In file included from shrot32pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack_90.lo
| In file included from shrot32pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate32_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot32pack.lo
| In file included from shrot32pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate32':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_180.lo
| In file included from shrot8pack_180.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_180':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_270.lo
| In file included from shrot8pack_270.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_270':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack_90.lo
| In file included from shrot8pack_90.c:31:0:
| shrotpack.h: In function 'shadowUpdateRotate8_90':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrot8pack.lo
| In file included from shrot8pack.c:30:0:
| shrotpack.h: In function 'shadowUpdateRotate8':
| shrotpack.h:109:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotpack.h:109:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
| CC shrotate.lo
| shrotate.c:62:19: warning: variable 'shaYoff' set but not used [-Wunused-but-set-variable]
| shrotate.c:62:10: warning: variable 'shaXoff' set but not used [-Wunused-but-set-variable]
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Some users of the shadow code don't call shadowInit, just shadowSetup
and so make sure the key is initialized there.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This patch only changes the API, not the implementation of the
devPrivates infrastructure. This will permit a new devPrivates
implementation to be layed into the server without requiring
simultaneous changes in every devPrivates user.
Signed-off-by: Keith Packard <keithp@keithp.com>
Tested-by: Tiago Vignatti <tiago.vignatti@nokia.com>
This is a combination of a huge mechanical patch and a few small
fixups required to finish the job. They were reviewed separately, but
because the server does not build without both pieces, I've merged
them together at this time.
The mechanical changes were performed by running the included
'fix-region' script over the whole tree:
$ git ls-files | grep -v '^fix-' | xargs ./fix-region
And then, the white space errors in the resulting patch were fixed
using the provided fix-patch-whitespace script.
$ sh ./fix-patch-whitespace
Thanks to Jamey Sharp for the mighty fine sed-generating sed script.
The hand-done changes involve removing functions from dix/region.c
that duplicate inline functions in include/regionstr.h, along with
their declarations in regionstr.h, mi.h and mispans.h.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
The only remaining X-functions used in server are XNF*, the rest is converted to
plain alloc/calloc/realloc/free/strdup.
X* functions are still exported from server and x* macros are still defined in
header file, so both ABI and API are not affected by this change.
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This patch was created with:
git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done
Signed-off-by: Keith Packard <keithp@keithp.com>
Save in a few special cases, _X_EXPORT should not be used in C source
files. Instead, it should be used in headers, and the proper C source
include that header. Some special cases are symbols that need to be
shared between modules, but not expected to be used by external drivers,
and symbols that are accessible via LoaderSymbol/dlopen.
This patch also adds conditionally some new sdk header files, depending
on extensions enabled. These files were added to match pattern for
other extensions/modules, that is, have the headers "deciding" symbol
visibility in the sdk. These headers are:
o Xext/panoramiXsrv.h, Xext/panoramiX.h
o fbpict.h (unconditionally)
o vidmodeproc.h
o mioverlay.h (unconditionally, used only by xaa)
o xfixes.h (unconditionally, symbols required by dri2)
LoaderSymbol and similar functions now don't have different prototypes,
in loaderProcs.h and xf86Module.h, so that both headers can be included,
without the need of defining IN_LOADER.
xf86NewInputDevice() device prototype readded to xf86Xinput.h, but
not exported (and with a comment about it).
This is done to actually change DIX_CFLAGS, as not all "modules" use
XORG_CFLAGS.
Also export the symbols that are required by other modules after
the change.
These symbols were removed from the X Server, or never declared.
One symbol that may need special attention is XkbBuildCoreState(),
that doesn't have a prototype anywhere, but is called from
xkb/xkbEvents.c:XkbFilterEvents(), and also used by the macros
XkbStateFieldFromRec() and XkbGrabStateFromRec() defined in
include/xkbstr.h.
fb/wfbrename.h also may need some cleanup, as it makes several
"renames" of non existing symbols.
This is the biggest "visibility" patch. Instead of doing a "export"
symbol on demand, export everything in the sdk, so that if some module
fails due to an unresolved symbol, it is because it is using a symbol
not in the sdk.
Most exported symbols shouldn't really be made visible, neither
advertised in the sdk, as they are only used by a single shared object.
Symbols in the sdk (or referenced in sdk macros), but not defined
anywhere include:
XkbBuildCoreState()
XkbInitialMap
XkbXIUnsupported
XkbCheckActionVMods()
XkbSendCompatNotify()
XkbDDXFakePointerButton()
XkbDDXApplyConfig()
_XkbStrCaseCmp()
_XkbErrMessages[]
_XkbErrCode
_XkbErrLocation
_XkbErrData
XkbAccessXDetailText()
XkbNKNDetailMaskText()
XkbLookupGroupAndLevel()
XkbInitAtoms()
XkbGetOrderedDrawables()
XkbFreeOrderedDrawables()
XkbConvertXkbComponents()
XkbWriteXKBSemantics()
XkbWriteXKBLayout()
XkbWriteXKBKeymap()
XkbWriteXKBFile()
XkbWriteCFile()
XkbWriteXKMFile()
XkbWriteToServer()
XkbMergeFile()
XkmFindTOCEntry()
XkmReadFileSection()
XkmReadFileSectionName()
InitExtInput()
xf86CheckButton()
xf86SwitchCoreDevice()
RamDacSetGamma()
RamDacRestoreDACValues()
xf86Bpp
xf86ConfigPix24
xf86MouseCflags[]
xf86SupportedMouseTypes[]
xf86NumMouseTypes
xf86ChangeBusIndex()
xf86EntityEnter()
xf86EntityLeave()
xf86WrapperInit()
xf86RingBell()
xf86findOptionBoolean()
xf86debugListOptions()
LoadSubModuleLocal()
LoaderSymbolLocal()
getInt10Rec()
xf86CurrentScreen
xf86ReallocatePciResources()
xf86NewSerialNumber()
xf86RandRSetInitialMode()
fbCompositeSolidMask_nx1xn
fbCompositeSolidMask_nx8888x0565C
fbCompositeSolidMask_nx8888x8888C
fbCompositeSolidMask_nx8x0565
fbCompositeSolidMask_nx8x0888
fbCompositeSolidMask_nx8x8888
fbCompositeSrc_0565x0565
fbCompositeSrc_8888x0565
fbCompositeSrc_8888x0888
fbCompositeSrc_8888x8888
fbCompositeSrcAdd_1000x1000
fbCompositeSrcAdd_8000x8000
fbCompositeSrcAdd_8888x8888
fbGeneration
fbIn
fbOver
fbOver24
fbOverlayGeneration
fbRasterizeEdges
fbRestoreAreas
fbSaveAreas
composeFunctions
VBEBuildVbeModeList()
VBECalcVbeModeIndex()
TIramdac3030CalculateMNPForClock()
shadowBufPtr
shadowFindBuf()
miRRGetScreenInfo()
RRSetScreenConfig()
RRModePruneUnused()
PixmanImageFromPicture()
extern int miPointerGetMotionEvents()
miClipPicture()
miRasterizeTriangle()
fbPush1toN()
fbInitializeBackingStore()
ddxBeforeReset()
SetupSprite()
InitSprite()
DGADeliverEvent()
SPECIAL CASES
o defined as _X_INTERNAL
xf86NewInputDevice()
o defined as static
fbGCPrivateKey
fbOverlayScreenPrivateKey
fbScreenPrivateKey
fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
GetGlyphs()
QueryGlyphExtents()
QueryTextExtents()
ParseGlyphCachingMode()
InitGlyphCaching()
SetGlyphCachingMode()
These hints allow an acceleration architecture to optimize allocation of certain
types of pixmaps, such as pixmaps that will serve as backing pixmaps for
redirected windows.
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
Get rid of almost all uses of these definitions. They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build. As well as
for miinitext.c. But largely gone.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
