Re: [PATCH synaptics 3/3] test: fix build error introduced in 9f9b55ab55ed5
Peter Hutterer peter.hutte...@who-t.net (03/01/2012): Bad search/replace, ended up in two xf86SetStrOption declarations which differed on ABIs 14. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=44335 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Reviewed-by: Cyril Brulebois k...@debian.org Tested-by: Cyril Brulebois k...@debian.org Thanks. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: PING: [PATCH xserver] xkb: Message actions suppress other key presses #28575
Hi, On 2 January 2012 20:44, Jeremy Huddleston jerem...@apple.com wrote: Poking Daniel, Chase, and Peter directly since they understand this magic best. On Nov 30, 2011, at 2:20 PM, Andreas Wettstein wrote: When a key to which a message action is mapped is held down, presses of other keys were not registered. Signed-off-by: Andreas Wettstein wettstein...@solnet.ch Seems sensible and doesn't contradict the spec, so: Reviewed-by: Daniel Stone dan...@fooishbar.org Looks fine for both master and 1.11. Cheers, Daniel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Request review patch compose key sequences musical symbols
Hi all, Please review attached patch to complere compose key sequences for musical symbols as is described in: https://bugs.freedesktop.org/show_bug.cgi?id=44313 Best regards, Pander diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre index d5b01b1..39bd047 100644 --- a/nls/en_US.UTF-8/Compose.pre +++ b/nls/en_US.UTF-8/Compose.pre @@ -209,6 +209,10 @@ XCOMM Dashes Multi_key minus minus minus : â U2014 # EM DASH XCOMM Musical alterations +Multi_key numbersign q : â© U2669 # QUARTER NOTE +Multi_key numbersign e : ⪠U266a # EIGHTH NOTE +Multi_key numbersign E : â« U266b # BEAMED EIGHTH NOTES +Multi_key numbersign S : ⬠U266c # BEAMED SIXTEENTH NOTES Multi_key numbersign b : â U266d # MUSIC FLAT SIGN Multi_key numbersign f : â® U266e # MUSIC NATURAL SIGN Multi_key numbersign numbersign : ⯠U266f # MUSIC SHARP SIGN ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libXrender] Fix alpha premultiplication in XRenderParseColor.
I believe just the division is unsigned with those changes. The multiplication will still be signed. On Jan 2, 2012, at 2:58 PM, Emanuele Giaquinta wrote: Due to C arithmetic conversion rules we must use an unsigned constant (or a cast) to perform the multiplication using unsigned arithmetic. --- src/Color.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Color.c b/src/Color.c index 9c76e58..23ef800 100644 --- a/src/Color.c +++ b/src/Color.c @@ -85,8 +85,8 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) def-blue = coreColor.blue; def-alpha = 0x; } -def-red = (def-red * def-alpha) / 65535; -def-green = (def-green * def-alpha) / 65535; -def-blue = (def-blue * def-alpha) / 65535; +def-red = (def-red * def-alpha) / 0xU; +def-green = (def-green * def-alpha) / 0xU; +def-blue = (def-blue * def-alpha) / 0xU; return 1; } -- 1.7.7.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libXrender] Fix alpha premultiplication in XRenderParseColor.
On Tue, Jan 03, 2012 at 08:21:32AM -0500, Jeremy Huddleston wrote: I believe just the division is unsigned with those changes. The multiplication will still be signed. No, the type of XRenderColor fields is unsigned short. On Jan 2, 2012, at 2:58 PM, Emanuele Giaquinta wrote: Due to C arithmetic conversion rules we must use an unsigned constant (or a cast) to perform the multiplication using unsigned arithmetic. --- src/Color.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Color.c b/src/Color.c index 9c76e58..23ef800 100644 --- a/src/Color.c +++ b/src/Color.c @@ -85,8 +85,8 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) def-blue = coreColor.blue; def-alpha = 0x; } -def-red = (def-red * def-alpha) / 65535; -def-green = (def-green * def-alpha) / 65535; -def-blue = (def-blue * def-alpha) / 65535; +def-red = (def-red * def-alpha) / 0xU; +def-green = (def-green * def-alpha) / 0xU; +def-blue = (def-blue * def-alpha) / 0xU; return 1; } -- 1.7.7.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xserver] dix: Set XITouchEmulatingPointer on events from the touch sequence emulating pointer events
On 01/02/2012 05:43 PM, carl...@gnome.org wrote: From: Carlos Garnacho carl...@gnome.org The internal flag is kept around, merely translated to XITouchEmulatingPointer when creating the XI2 events that will be delivered to the client. Signed-off-by: Carlos Garnacho carl...@gnome.org Looks right to me. Reviewed-by: Chase Douglas chase.doug...@canonical.com ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH XTS] lib/Xinput: include stdlib for getenv
On 01/02/2012 09:52 PM, Peter Hutterer wrote: Crashes XSetDeviceFocus and probably everything else in XI that relies on d = getenv(DISPLAY); dpy = XOpenDisplay(d); With this patch, the tests now change from UNRESOLVED to UNTESTED. Hooray. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Reviewed-by: Chase Douglas chase.doug...@canonical.com ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH XTS] lib/Xinput: check for the new device usage types
On 01/02/2012 10:00 PM, Peter Hutterer wrote: IsXExtensionPointer/Keyboard were introduced with XI 1.4, check for those too before claiming there aren't any devices. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Looks right to me. Reviewed-by: Chase Douglas chase.doug...@canonical.com ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
support for APL character overstrikes in en_US.UTF-8/Compose
I have proposed some additional compositions to support the APL programming language. See https://bugs.freedesktop.org/show_bug.cgi?id=44059 APL started with IBM golf ball terminals and has always had the concept of composed characters which were built with overstrikes. So ∇ overstruck | produced ⍒. The additions proposed cover all of the overstrikes which can be produced by the variants of apl keyboards in xkb/sybols/apl which has just been updated by Sergey. I have also provided support for the circled alphabet and the circled digits. Since the letter o had already been used with c and r for the copyright and registered symbols, I used the digit 0. I also coded the use of the ○. I have only coded these in one order the 0 or ○ have to come first. For the actual APL characters I have coded both orders. I could have worked my way through the whole Mathematical Operators and Miscellaneous Technical but I am not aware of the cost of an extra line in Compose. I have only coded the characters that I am aware of being in use in extant APLs. Is en_US.UTF-8/Compose.pre the only file I should be changing? Should I be creating an apl locale with its own Compose file that is then included in en_US.UTF-8/Compose? Geoff Streeter ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-docs] informaltable cleanup
On 12-01-02 10:40 PM, Matt Dew wrote: On certain tables, add top and bottom borders to table header and a bottom border to the table. This matches what those tables in the old pdfs looked like. the ?dbfo keep-together='always' prevents tables from splitting across pages. Useful for tiny tables. Converting the colwidth to a floating point, IE, 1* - 1.0* cleans up these build errors: WARNING: table-layout=fixed and column-width unspecified = falling back to proportional-column-width(1) --- specs/CTEXT/ctext.xml | 181 ++--- 1 files changed, 96 insertions(+), 85 deletions(-) Check that HTML looks good after this change (or did not get worse). Acked-by: Gaetan Nadon mems...@videotron.ca ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH XTS] lib/Xinput: include stdlib for getenv
On 01/02/12 21:52, Peter Hutterer wrote: Crashes XSetDeviceFocus and probably everything else in XI that relies on d = getenv(DISPLAY); dpy = XOpenDisplay(d); With this patch, the tests now change from UNRESOLVED to UNTESTED. Hooray. Signed-off-by: Peter Huttererpeter.hutte...@who-t.net --- Figuring out why getenv() returns garbage took longer than necessary... I suspect there are a few more mines like this, but they're hard to spot given that there seem to be more warnings than regular compiler output. xts5/src/lib/XInput.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xts5/src/lib/XInput.c b/xts5/src/lib/XInput.c index eba66c5..067fca0 100644 --- a/xts5/src/lib/XInput.c +++ b/xts5/src/lib/XInput.c @@ -68,6 +68,7 @@ SOFTWARE. #endif #includestdio.h +#includestdlib.h #ifdef INPUTEXTENSION #include X11/extensions/XIproto.h #include X11/extensions/XInput.h Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com though the root cause seems to be people writing pointless code, since XOpenDisplay(NULL) will do the getenv(DISPLAY) for you. -- -Alan Coopersmith-alan.coopersm...@oracle.com Oracle Solaris Platform Engineering: X Window System ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xorg-docs] informaltable cleanup
On 01/03/2012 08:41 AM, Gaetan Nadon wrote: On 12-01-02 10:40 PM, Matt Dew wrote: On certain tables, add top and bottom borders to table header and a bottom border to the table. This matches what those tables in the old pdfs looked like. the?dbfo keep-together='always' prevents tables from splitting across pages. Useful for tiny tables. Converting the colwidth to a floating point, IE, 1* - 1.0* cleans up these build errors: WARNING: table-layout=fixed and column-width unspecified = falling back to proportional-column-width(1) --- specs/CTEXT/ctext.xml | 181 ++--- 1 files changed, 96 insertions(+), 85 deletions(-) Check that HTML looks good after this change (or did not get worse). HTML, text and ps output look fine as well. Acked-by: Gaetan Nadonmems...@videotron.ca ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH v2] Workaround conflict between Solaris sys/list.h Xorg list.h definitions
Tested-by: Aaron Plattner aplatt...@nvidia.com Reviewed-by: Aaron Plattner aplatt...@nvidia.com Grammar nitpick: Workaround is a noun. Work around is a (compound) verb. On 12/23/2011 03:23 PM, Alan Coopersmith wrote: sys/ipc_impl.h includes the Solarissys/list.h but doesn't use any definitions from it unless _KERNEL is defined for building a kernel module, so we can simply fake its header guard to skip its inclusion in Xext/shm.c sys/proc.h also includes it, but we don't actually need anything from that header to be included, so we can just move it into the skip on Solaris list in xf86_OSlib.h Signed-off-by: Alan Coopersmithalan.coopersm...@oracle.com --- Changed since v1: - Added explanations of what why this is being done - Removed list_t typedefs in shm.c, since we don't actually need them While I appreciate Jamey's feedback on making this cleaner, the only cleaner thing I can see to do is break the Xorg list API by renaming it to avoid conflicts with OS-provided list API's, and I didn't want to do that unilaterally for just this one issue. The xf86_OSlib.h change does suggest that a cleanup to consider for the next merge window would be to drop the SVR3 and non-Solaris SVR4 support, now that the SCO ports have gone defunct. (SCO Solaris were the only SysV variants supported since the current X.Org took over, and the SCO port was abandoned several years ago and mostly removed from the X server last year.) Xext/shm.c |4 hw/xfree86/os-support/xf86_OSlib.h |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Xext/shm.c b/Xext/shm.c index 7ca027a..bd5253c 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -58,6 +58,10 @@ in this Software without prior written authorization from The Open Group. /* Needed for Solaris cross-zone shared memory extension */ #ifdef HAVE_SHMCTL64 + +/* Workaround conflicts between Solarissys/list.hXorg list.h */ +#define _SYS_LIST_H + #includesys/ipc_impl.h #define SHMSTAT(id, buf) shmctl64(id, IPC_STAT64, buf) #define SHMSTAT_TYPE struct shmid_ds64 diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 0a5861f..45500db 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -98,8 +98,8 @@ # if !(defined (sun) defined (SVR4)) #includesys/immu.h #includesys/region.h +#includesys/proc.h # endif -# includesys/proc.h # includesys/tss.h # includesys/sysi86.h # if defined(SVR4) !defined(sun) --- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. --- ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Always install xaa sdk headers
On Tue, Jan 3, 2012 at 16:22:24 +1000, Peter Hutterer wrote: From: Adam Jackson a...@redhat.com Always install XAA SDK headers so drivers still build even with --disable-xaa Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- hw/xfree86/Makefile.am |2 -- hw/xfree86/xaa/Makefile.am |4 2 files changed, 4 insertions(+), 2 deletions(-) ajax updated a bunch of drivers to cope better, but mga is still not fixed for this afaict. Cheers, Julien ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libpciaccess] OpenBSD: Implement map_legacy and legacy_io
From: Jeremy Huddleston jerem...@apple.com Date: Sat, 31 Dec 2011 15:08:52 -0500 On Dec 31, 2011, at 2:50 PM, Mark Kettenis wrote: From: Jeremy Huddleston jerem...@apple.com Date: Sat, 31 Dec 2011 10:28:11 -0500 There is a logic error in the preprocessing which seems to assume that PCI_MAGIC_IO_RANGE is defined iff !(i386 || x86_64). Wouldn't call this a logic error, but yes, OpenBSD/i386 and OpenBSD/amd64 will not define PCI_MAGIC_IO_RANGE. Thanks. That satisfies my OCD. Reviewed-by: Jeremy Huddleston jerem...@apple.com Thanks! Pushed: a798395..b56f9a8 master - master ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] Always install xaa sdk headers
On 1/3/12 2:18 PM, Julien Cristau wrote: On Tue, Jan 3, 2012 at 16:22:24 +1000, Peter Hutterer wrote: From: Adam Jacksona...@redhat.com Always install XAA SDK headers so drivers still build even with --disable-xaa Signed-off-by: Peter Huttererpeter.hutte...@who-t.net --- hw/xfree86/Makefile.am |2 -- hw/xfree86/xaa/Makefile.am |4 2 files changed, 4 insertions(+), 2 deletions(-) ajax updated a bunch of drivers to cope better, but mga is still not fixed for this afaict. The intent with my most recent round of XAA fixes was to make it runtime-optional; libxaa can exist or not and the drivers will survive. Build-time ifdefs seemed like more hassle than I wanted to deal with, but if someone else wants to, go wild. - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Mesa-dev] [PATCH 20/20] tests/glx: Add unit tests for GLX_ARB_create_context GLX protocol
On 01/03/2012 11:13 AM, Mike Lothian wrote: Hi Ever since these tests went in I get failures during configure: configure: creating ./config.status config.status: creating configs/autoconf config.status: error: cannot find input file: `tests/Makefile.in' Before I raise a bug am I doing something stupid? It's possible that I didn't get the automake magic right when gtest isn't installed. Is the program gtest-config in your path? ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: X.org testing with Google Test
On 01/02/2012 06:06 PM, Chase Douglas wrote: On 01/02/2012 05:54 PM, Jeremy Huddleston wrote: Also, the tinderbox currently does make use of the existing unit tests in the server by running 'make check' after the build. I assume we could easily add these new unit tests to 'make check' and it will just work Correct. In Makefile.am, you would add a new xorg-gtest derived executable to the TESTS variable (and noinst_PROGRAMS so it's not installed). Then define the sources and such for the executable. Automake will build and execute the test program when make check is performed. I personally really like how the Jenkins interface looks, so I don't think it would be bad to convert from tinderbox. However, that's the true extent of my knowledge, which isn't enough to make a real decision with :). The path of least resistance is likely just adding any new tests to 'make check' and letting tinderbox go about as-is. Having it in 'make check' also ensures that keithp runs it before pulling patches. The one issue with xorg-gtest and a dummy server is that the server must be run as root. This is because the dummy.conf file is installed in a non-standard location (for obvious reasons). Does it still make sense to limit the configuration file locations for non-root users? Should we add a -dummy flag to Xorg so we don't need a dummy.conf file? -- Chase ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH libXrender] Fix alpha premultiplication in XRenderParseColor.
Ah, ok. Reviewed-by: Jeremy Huddleston jerem...@apple.com On Jan 3, 2012, at 8:42 AM, Emanuele Giaquinta wrote: On Tue, Jan 03, 2012 at 08:21:32AM -0500, Jeremy Huddleston wrote: I believe just the division is unsigned with those changes. The multiplication will still be signed. No, the type of XRenderColor fields is unsigned short. On Jan 2, 2012, at 2:58 PM, Emanuele Giaquinta wrote: Due to C arithmetic conversion rules we must use an unsigned constant (or a cast) to perform the multiplication using unsigned arithmetic. --- src/Color.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Color.c b/src/Color.c index 9c76e58..23ef800 100644 --- a/src/Color.c +++ b/src/Color.c @@ -85,8 +85,8 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) def-blue = coreColor.blue; def-alpha = 0x; } -def-red = (def-red * def-alpha) / 65535; -def-green = (def-green * def-alpha) / 65535; -def-blue = (def-blue * def-alpha) / 65535; +def-red = (def-red * def-alpha) / 0xU; +def-green = (def-green * def-alpha) / 0xU; +def-blue = (def-blue * def-alpha) / 0xU; return 1; } -- 1.7.7.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:libX11] Add more Xkb man pages to the See Also lists for core keyboard functions
On Wed, Dec 28, 2011 at 09:38:51PM -0800, Alan Coopersmith wrote: Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com Reviewed-by: Peter Hutterer peter.hutte...@who-t.net Cheers, Peter --- man/IsCursorKey.man|1 + man/XChangeKeyboardControl.man |4 man/XChangeKeyboardMapping.man |1 + man/XLookupKeysym.man |2 ++ man/XStringToKeysym.man|1 + 5 files changed, 9 insertions(+), 0 deletions(-) diff --git a/man/IsCursorKey.man b/man/IsCursorKey.man index 30c2b76..0fa3dfb 100644 --- a/man/IsCursorKey.man +++ b/man/IsCursorKey.man @@ -203,6 +203,7 @@ macro returns .ZN True if the specified KeySym is a vendor-private keypad key. .SH SEE ALSO +XkbKeyTypesForCoreSymbols(__libmansuffix__), AllPlanes(__libmansuffix__), BlackPixelOfScreen(__libmansuffix__), ImageByteOrder(__libmansuffix__) diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man index 3179614..63f9392 100644 --- a/man/XChangeKeyboardControl.man +++ b/man/XChangeKeyboardControl.man @@ -443,6 +443,10 @@ by the argument's type is accepted. Any argument defined as a set of alternatives can generate this error. .SH SEE ALSO XChangeKeyboardMapping(__libmansuffix__), +XkbChangeEnabledControls(__libmansuffix__), +XkbBell(__libmansuffix__), +XkbDeviceBell(__libmansuffix__), +XkbGetMap(__libmansuffix__), XSetPointerMapping(__libmansuffix__) .br \fI\*(xL\fP diff --git a/man/XChangeKeyboardMapping.man b/man/XChangeKeyboardMapping.man index 71b7a91..b964548 100644 --- a/man/XChangeKeyboardMapping.man +++ b/man/XChangeKeyboardMapping.man @@ -442,6 +442,7 @@ by the argument's type is accepted. Any argument defined as a set of alternatives can generate this error. .SH SEE ALSO XFree(__libmansuffix__), +XkbGetMap(__libmansuffix__), XSetPointerMapping(__libmansuffix__) .br \fI\*(xL\fP diff --git a/man/XLookupKeysym.man b/man/XLookupKeysym.man index d8d99d3..bdbfe31 100644 --- a/man/XLookupKeysym.man +++ b/man/XLookupKeysym.man @@ -267,6 +267,8 @@ Note that you can rebind a KeySym that may not exist. XButtonEvent(__libmansuffix__), XMapEvent(__libmansuffix__), XStringToKeysym(__libmansuffix__), +XkbLookupKeySym(__libmansuffix__), +XkbRefreshKeyboardMapping(__libmansuffix__), XmbLookupString(__libmansuffix__), XwcLookupString(__libmansuffix__), Xutf8LookupString(__libmansuffix__), diff --git a/man/XStringToKeysym.man b/man/XStringToKeysym.man index 067765b..515ca91 100644 --- a/man/XStringToKeysym.man +++ b/man/XStringToKeysym.man @@ -220,6 +220,7 @@ upper_return. Support for conversion of other than Latin and Cyrillic KeySyms is implementation-dependent. .SH SEE ALSO +XkbKeycodeToKeysym(__libmansuffix__), XLookupKeysym(__libmansuffix__) .br \fI\*(xL\fP -- 1.7.3.2 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH intel-gpu-tools 0/4] Upgrade module configuration and packaging
On 01/02/2012 08:17 AM, Gaetan Nadon wrote:
This module is hosted as an X.Org app and is published as such.
This patch adds some missing packaging files and sets some basic
infrastructure
common to all xorg modules which saves maintenance in the long run.
http://www.x.org/wiki/NewModuleGuidelines
Gaetan Nadon (4):
Add mandatory COPYING file.
Use standard .gitignore file and layout
Man pages still showing version 1.0 in the 1.1 release
Add mandatory ChangeLog and INSTALL files
.gitignore | 154
+---
COPYING| 108 ++
Makefile.am| 14 ++-
benchmarks/.gitignore |5 +
configure.ac |6 +-
debugger/.gitignore|2 +
debugger/system_routine/.gitignore |2 +
m4/.gitignore |5 -
man/Makefile.am| 44 --
man/{intel_audio_dump.1 = intel_audio_dump.man} |2 +-
man/{intel_bios_dumper.1 = intel_bios_dumper.man} |2 +-
man/{intel_bios_reader.1 = intel_bios_reader.man} |2 +-
...intel_error_decode.1 = intel_error_decode.man} |2 +-
man/{intel_gpu_top.1 = intel_gpu_top.man} |2 +-
man/{intel_gtt.1 = intel_gtt.man} |2 +-
man/{intel_lid.1 = intel_lid.man} |2 +-
man/{intel_reg_dumper.1 = intel_reg_dumper.man} |2 +-
man/{intel_reg_read.1 = intel_reg_read.man} |2 +-
...intel_reg_snapshot.1 = intel_reg_snapshot.man} |2 +-
man/{intel_reg_write.1 = intel_reg_write.man} |2 +-
man/{intel_stepping.1 = intel_stepping.man} |2 +-
...ad_blit_large.1 = intel_upload_blit_large.man} |2 +-
...large_gtt.1 = intel_upload_blit_large_gtt.man} |2 +-
...large_map.1 = intel_upload_blit_large_map.man} |2 +-
...ad_blit_small.1 = intel_upload_blit_small.man} |2 +-
tests/.gitignore | 51 +++
tools/.gitignore | 20 +++
27 files changed, 314 insertions(+), 129 deletions(-)
create mode 100644 COPYING
create mode 100644 benchmarks/.gitignore
create mode 100644 debugger/.gitignore
create mode 100644 debugger/system_routine/.gitignore
delete mode 100644 m4/.gitignore
rename man/{intel_audio_dump.1 = intel_audio_dump.man} (85%)
rename man/{intel_bios_dumper.1 = intel_bios_dumper.man} (88%)
rename man/{intel_bios_reader.1 = intel_bios_reader.man} (90%)
rename man/{intel_error_decode.1 = intel_error_decode.man} (91%)
rename man/{intel_gpu_top.1 = intel_gpu_top.man} (96%)
rename man/{intel_gtt.1 = intel_gtt.man} (90%)
rename man/{intel_lid.1 = intel_lid.man} (89%)
rename man/{intel_reg_dumper.1 = intel_reg_dumper.man} (93%)
rename man/{intel_reg_read.1 = intel_reg_read.man} (89%)
rename man/{intel_reg_snapshot.1 = intel_reg_snapshot.man} (87%)
rename man/{intel_reg_write.1 = intel_reg_write.man} (89%)
rename man/{intel_stepping.1 = intel_stepping.man} (90%)
rename man/{intel_upload_blit_large.1 = intel_upload_blit_large.man} (90%)
rename man/{intel_upload_blit_large_gtt.1 =
intel_upload_blit_large_gtt.man} (89%)
rename man/{intel_upload_blit_large_map.1 =
intel_upload_blit_large_map.man} (89%)
rename man/{intel_upload_blit_small.1 = intel_upload_blit_small.man} (90%)
create mode 100644 tests/.gitignore
create mode 100644 tools/.gitignore
I think Daniel Vetter is maintaining this now. He has told me he isn't
subscribed to the list. I would recommend resending with him in CC.
(Same for the other series)
By the way, r-b from me on this series.
~Ben
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xf86-input-evdev] Set the default resolution to 0
If we don't know the resolution, set it to 0. This is invalid, and tells
the X client that we don't know the resolution, rather than reporting an
incorrect value.
This value was originally from commit
6271494faa4c45f4fa10509f72e0515f2cef36c6, which is the initial commit
from Adam Jackson adding absolute axis support.
Signed-off-by: Chase Douglas chase.doug...@canonical.com
---
src/evdev.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/evdev.c b/src/evdev.c
index 9f3a22a..1547a6f 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1323,7 +1323,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
for (axis = ABS_X; axis ABS_MT_SLOT; axis++) {
int axnum = pEvdev-axis_map[axis];
-int resolution = 1;
+int resolution = 0
if (axnum == -1)
continue;
@@ -1345,7 +1345,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
#ifdef MULTITOUCH
for (axis = ABS_MT_TOUCH_MAJOR; axis = ABS_MAX; axis++) {
int axnum = pEvdev-axis_map[axis];
-int resolution = 1;
+int resolution = 0
int j;
BOOL skip = FALSE;
--
1.7.7.3
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [xproto: PATCH] Xmd.h: amd64-x32 ABI defines sizeof(long) == sizeof (void*) == 4
On 2011-12-30 15:07, Sergei Trofimovich wrote: On Wed, 28 Dec 2011 12:45:03 -0800 Alan Coopersmith alan.coopersm...@oracle.com wrote: C code checking __amd64__ mostly does so to find out the size of long pointers. Instructions are usually at the assembly level, not the C code level. It's a very generic tet. Such software is already broken for very popular MSVC compiler No, since MSVC defines _M_X64 instead. It does not define __amd64__. (or mingw64-gcc). (mingw64-gcc is arguably broken too). FWIW, I agree with Alan. __amd64__ has had a very specific meaning for almost a decade. Please don't try to change the meaning now. Peter Harris -- Open Text Connectivity Solutions Group Peter Harrishttp://connectivity.opentext.com/ Research and DevelopmentPhone: +1 905 762 6001 phar...@opentext.comToll Free: 1 877 359 4866 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH v2 xf85-input-evdev] Set the default resolution to 0
If we don't know the resolution, set it to 0. This is invalid, and tells
the X client that we don't know the resolution, rather than reporting an
incorrect value.
This value was originally from commit
6271494faa4c45f4fa10509f72e0515f2cef36c6, which is the initial commit
from Adam Jackson adding absolute axis support.
Signed-off-by: Chase Douglas chase.doug...@canonical.com
---
Changes from v1:
* Silly typo, forgot ending semicolon on changed lines
src/evdev.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/evdev.c b/src/evdev.c
index 9f3a22a..82cdb00 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -1323,7 +1323,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
for (axis = ABS_X; axis ABS_MT_SLOT; axis++) {
int axnum = pEvdev-axis_map[axis];
-int resolution = 1;
+int resolution = 0;
if (axnum == -1)
continue;
@@ -1345,7 +1345,7 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
#ifdef MULTITOUCH
for (axis = ABS_MT_TOUCH_MAJOR; axis = ABS_MAX; axis++) {
int axnum = pEvdev-axis_map[axis];
-int resolution = 1;
+int resolution = 0;
int j;
BOOL skip = FALSE;
--
1.7.7.3
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 02/11] glx: Don't track GLClientmajorVersion or GLClientminorVersion
On Fri, 23 Dec 2011 15:18:20 -0800 Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com Nothing uses these fields anywhere in the server. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- Looks fine. Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org -- Jesse Barnes, Intel Open Source Technology Center ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 03/11] glx: Extend __GLXscreen::createContext to take attributes
On Fri, 23 Dec 2011 15:18:21 -0800 Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- glx/glxcmds.c | 13 ++--- glx/glxdri.c | 10 +- glx/glxdri2.c |5 - glx/glxdriswrast.c |4 +++- glx/glxscreens.h |5 - 5 files changed, 30 insertions(+), 7 deletions(-) You might include some verbiage in the changelog about why you're adding attribs here (to support the later stuff). Other than that it looks like a straightforward addition. Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org -- Jesse Barnes, Intel Open Source Technology Center ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 05/11] glx: Optionally call DRI2 createContextAttribs from __glXDRIscreenCreateContext
On Fri, 23 Dec 2011 15:18:23 -0800
Ian Romanick i...@freedesktop.org wrote:
From: Ian Romanick ian.d.roman...@intel.com
Signed-off-by: Ian Romanick ian.d.roman...@intel.com
---
glx/glxdri2.c | 143 ++--
1 files changed, 137 insertions(+), 6 deletions(-)
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 18b5aad..4f112b1 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -47,6 +47,7 @@
#include glxserver.h
#include glxutil.h
#include glxdricommon.h
+#include GL/glxtokens.h
#include glapitable.h
#include glapi.h
@@ -383,6 +384,56 @@ __glXDRIscreenDestroy(__GLXscreen *baseScreen)
free(screen);
}
+static Bool
+dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
+ unsigned *major_ver, unsigned *minor_ver,
+ uint32_t *flags, unsigned *error)
+{
+unsigned i;
+
+if (num_attribs == 0)
+ return True;
+
+if (attribs == NULL) {
+ *error = BadImplementation;
+ return False;
+}
+
+*major_ver = 1;
+*minor_ver = 0;
+
+for (i = 0; i num_attribs; i++) {
+ switch (attribs[i * 2]) {
+ case GLX_CONTEXT_MAJOR_VERSION_ARB:
+ *major_ver = attribs[i * 2 + 1];
+ break;
+ case GLX_CONTEXT_MINOR_VERSION_ARB:
+ *minor_ver = attribs[i * 2 + 1];
+ break;
+ case GLX_CONTEXT_FLAGS_ARB:
+ *flags = attribs[i * 2 + 1];
+ break;
+ case GLX_RENDER_TYPE:
+ break;
+ default:
+ /* If an unknown attribute is received, fail.
+ */
+ *error = BadValue;
+ return False;
+ }
+}
Do you want to catch the case where multiple versions and/or flags are
provided and error out? Pretty esoteric I guess but I'm not sure what
the semantics are supposed to be.
+
+/* Unknown flag value.
+ */
+if (*flags ~(__DRI_CTX_FLAG_DEBUG |
__DRI_CTX_FLAG_FORWARD_COMPATIBLE)) {
+ *error = BadValue;
+ return False;
+}
+
+*error = Success;
+return True;
+}
+
static __GLXcontext *
__glXDRIscreenCreateContext(__GLXscreen *baseScreen,
__GLXconfig *glxConfig,
@@ -403,8 +454,10 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
driShare = NULL;
context = calloc(1, sizeof *context);
-if (context == NULL)
+if (context == NULL) {
+ *error = BadAlloc;
return NULL;
+}
context-base.destroy = __glXDRIcontextDestroy;
context-base.makeCurrent = __glXDRIcontextMakeCurrent;
@@ -413,12 +466,82 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
context-base.textureFromPixmap = __glXDRItextureFromPixmap;
context-base.wait = __glXDRIcontextWait;
-context-driContext =
- (*screen-dri2-createNewContext)(screen-driScreen,
- config-driConfig,
- driShare, context);
+#if __DRI_DRI2_VERSION = 3
+if (screen-dri2-base.version = 3) {
+ uint32_t ctx_attribs[3 * 2];
+ unsigned num_ctx_attribs = 0;
+ unsigned dri_err = 0;
+ unsigned major_ver;
+ unsigned minor_ver;
+ uint32_t flags;
+
+ if (num_attribs != 0) {
+ if (!dri2_convert_glx_attribs(num_attribs, attribs,
+ major_ver, minor_ver,
+ flags, error))
+ return NULL;
+
+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MAJOR_VERSION;
+ ctx_attribs[num_ctx_attribs++] = major_ver;
+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MINOR_VERSION;
+ ctx_attribs[num_ctx_attribs++] = minor_ver;
+
+ if (flags != 0) {
+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_FLAGS;
+
+ /* The current __DRI_CTX_FLAG_* values are identical to the
+ * GLX_CONTEXT_*_BIT values.
+ */
+ ctx_attribs[num_ctx_attribs++] = flags;
+ }
+ }
+
+ context-driContext =
+ (*screen-dri2-createContextAttribs)(screen-driScreen,
+ __DRI_API_OPENGL,
+ config-driConfig,
+ driShare,
+ num_ctx_attribs / 2,
+ ctx_attribs,
+ dri_err,
+ context);
+
+ switch (dri_err) {
+ case __DRI_CTX_ERROR_SUCCESS:
+ *error = Success;
+ break;
+ case __DRI_CTX_ERROR_NO_MEMORY:
+ *error = BadAlloc;
+ break;
+ case __DRI_CTX_ERROR_BAD_API:
+ *error = __glXError(GLXBadProfileARB);
+ break;
+ case
Re: [PATCH 07/11] glx: Initialize all context fields together
On Fri, 23 Dec 2011 15:18:25 -0800 Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- glx/glxcmds.c | 23 --- 1 files changed, 8 insertions(+), 15 deletions(-) Seems like a reasonable cleanup. Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org -- Jesse Barnes, Intel Open Source Technology Center ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 08/11] glx: Initialize remaining context fields
On Fri, 23 Dec 2011 15:18:26 -0800 Ian Romanick i...@freedesktop.org wrote: From: Ian Romanick ian.d.roman...@intel.com There is no reason to assume the screen's context allocated initialized these fields, so don't. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- glx/glxcmds.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 8a32a22..983f21a 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -296,7 +296,14 @@ DoCreateContext(__GLXclientState *cl, GLXContextID gcId, glxc-idExists = GL_TRUE; glxc-isCurrent = GL_FALSE; glxc-isDirect = isDirect; +glxc-hasUnflushedCommands = GL_FALSE; glxc-renderMode = GL_RENDER; +glxc-feedbackBuf = NULL; +glxc-feedbackBufSize = 0; +glxc-selectBuf = NULL; +glxc-selectBufSize = 0; +glxc-drawPriv = NULL; +glxc-readPriv = NULL; /* ** Register this context as a resource. I guess we were assuming the screen callback did this by zeroing out the new allocation? At any rate, making things explicit is ok. You might add a comment describing the expectations though. Other than that: Reviewed-by: Jesse Barnes jbar...@virtuousgeek.org -- Jesse Barnes, Intel Open Source Technology Center ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 09/11] glx: Use one function to add a context to all global tables
On Fri, 23 Dec 2011 15:18:27 -0800
Ian Romanick i...@freedesktop.org wrote:
From: Ian Romanick ian.d.roman...@intel.com
Instead of having separate __glXAddContextToList and AddResource
functions, just have one function that does both steps.
Signed-off-by: Ian Romanick ian.d.roman...@intel.com
---
glx/glxcmds.c |9 +++--
glx/glxext.c | 10 +-
glx/glxext.h |2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 983f21a..0dce420 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -305,16 +305,13 @@ DoCreateContext(__GLXclientState *cl, GLXContextID gcId,
glxc-drawPriv = NULL;
glxc-readPriv = NULL;
-/*
-** Register this context as a resource.
-*/
-if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) {
+/* Add the new context to the various global tables of GLX contexts.
+ */
+if (!__glXAddContext(glxc)) {
(*glxc-destroy)(glxc);
client-errorValue = gcId;
return BadAlloc;
}
-
-__glXAddToContextList(glxc);
return Success;
}
diff --git a/glx/glxext.c b/glx/glxext.c
index f8fe43b..61eb35b 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -152,10 +152,18 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID
xid)
return True;
}
-void __glXAddToContextList(__GLXcontext *cx)
+Bool __glXAddContext(__GLXcontext *cx)
{
+/*
+** Register this context as a resource.
+*/
+if (!AddResource(cx-id, __glXContextRes, (pointer)cx)) {
+ return False;
+}
+
cx-next = glxAllContexts;
glxAllContexts = cx;
+return True;
}
static void __glXRemoveFromContextList(__GLXcontext *cx)
diff --git a/glx/glxext.h b/glx/glxext.h
index 58cf054..cb1707d 100644
--- a/glx/glxext.h
+++ b/glx/glxext.h
@@ -38,7 +38,7 @@
extern GLboolean __glXFreeContext(__GLXcontext *glxc);
extern void __glXFlushContextCache(void);
-extern void __glXAddToContextList(__GLXcontext *cx);
+extern Bool __glXAddContext(__GLXcontext *cx);
extern void __glXErrorCallBack(GLenum code);
extern void __glXClearErrorOccured(void);
extern GLboolean __glXErrorOccured(void);
Seems ok, but should you update the corresponding DMX code too?
--
Jesse Barnes, Intel Open Source Technology Center
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [xproto: PATCH] Xmd.h: amd64-x32 ABI defines sizeof(long) == sizeof (void*) == 4
On 12/28/11 3:29 PM, Lu, Hongjiu wrote: __LP64__ isn't the part of x86-64 psABI while GCC always define __LP64__ for 64bit long on x86. I can check if other compilers do the same. In most cases, __amd64__ is checked for 64bit instructions and we have ported those we have found so far to x32 so that we can use one __amd64__ block to support both x32 and x86-64. With all due respect, you're out of your mind. __amd64__ means LP64 on Linux. It does not mean AMD64 instruction set with some arbitrarily defined pointer size, in the same way that __ppc64__ does not mean that. Your design is broken. Consider making it not be broken. The way you do this is you make your psabi define __x32__, instead of having it redefine a symbol with pre-existing semantics to mean something _other_ than the pre-existing semantics. - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH 05/11] glx: Optionally call DRI2 createContextAttribs from __glXDRIscreenCreateContext
On 01/03/2012 04:22 PM, Jesse Barnes wrote:
On Fri, 23 Dec 2011 15:18:23 -0800
Ian Romanicki...@freedesktop.org wrote:
From: Ian Romanickian.d.roman...@intel.com
Signed-off-by: Ian Romanickian.d.roman...@intel.com
---
glx/glxdri2.c | 143 ++--
1 files changed, 137 insertions(+), 6 deletions(-)
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 18b5aad..4f112b1 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -47,6 +47,7 @@
#include glxserver.h
#include glxutil.h
#include glxdricommon.h
+#includeGL/glxtokens.h
#include glapitable.h
#include glapi.h
@@ -383,6 +384,56 @@ __glXDRIscreenDestroy(__GLXscreen *baseScreen)
free(screen);
}
+static Bool
+dri2_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs,
+unsigned *major_ver, unsigned *minor_ver,
+uint32_t *flags, unsigned *error)
+{
+unsigned i;
+
+if (num_attribs == 0)
+ return True;
+
+if (attribs == NULL) {
+ *error = BadImplementation;
+ return False;
+}
+
+*major_ver = 1;
+*minor_ver = 0;
+
+for (i = 0; i num_attribs; i++) {
+ switch (attribs[i * 2]) {
+ case GLX_CONTEXT_MAJOR_VERSION_ARB:
+ *major_ver = attribs[i * 2 + 1];
+ break;
+ case GLX_CONTEXT_MINOR_VERSION_ARB:
+ *minor_ver = attribs[i * 2 + 1];
+ break;
+ case GLX_CONTEXT_FLAGS_ARB:
+ *flags = attribs[i * 2 + 1];
+ break;
+ case GLX_RENDER_TYPE:
+ break;
+ default:
+ /* If an unknown attribute is received, fail.
+*/
+ *error = BadValue;
+ return False;
+ }
+}
Do you want to catch the case where multiple versions and/or flags are
provided and error out? Pretty esoteric I guess but I'm not sure what
the semantics are supposed to be.
The spec doesn't say anything about this case, so I don't think there's
any behavior that an application could rely on. It might be interesting
to see what the other guys do, but I'm not very concerned about that
right now.
+
+/* Unknown flag value.
+ */
+if (*flags ~(__DRI_CTX_FLAG_DEBUG | __DRI_CTX_FLAG_FORWARD_COMPATIBLE)) {
+ *error = BadValue;
+ return False;
+}
+
+*error = Success;
+return True;
+}
+
static __GLXcontext *
__glXDRIscreenCreateContext(__GLXscreen *baseScreen,
__GLXconfig *glxConfig,
@@ -403,8 +454,10 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
driShare = NULL;
context = calloc(1, sizeof *context);
-if (context == NULL)
+if (context == NULL) {
+ *error = BadAlloc;
return NULL;
+}
context-base.destroy = __glXDRIcontextDestroy;
context-base.makeCurrent = __glXDRIcontextMakeCurrent;
@@ -413,12 +466,82 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
context-base.textureFromPixmap =__glXDRItextureFromPixmap;
context-base.wait = __glXDRIcontextWait;
-context-driContext =
- (*screen-dri2-createNewContext)(screen-driScreen,
- config-driConfig,
- driShare, context);
+#if __DRI_DRI2_VERSION= 3
+if (screen-dri2-base.version= 3) {
+ uint32_t ctx_attribs[3 * 2];
+ unsigned num_ctx_attribs = 0;
+ unsigned dri_err = 0;
+ unsigned major_ver;
+ unsigned minor_ver;
+ uint32_t flags;
+
+ if (num_attribs != 0) {
+ if (!dri2_convert_glx_attribs(num_attribs, attribs,
+ major_ver,minor_ver,
+ flags, error))
+ return NULL;
+
+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MAJOR_VERSION;
+ ctx_attribs[num_ctx_attribs++] = major_ver;
+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_MINOR_VERSION;
+ ctx_attribs[num_ctx_attribs++] = minor_ver;
+
+ if (flags != 0) {
+ ctx_attribs[num_ctx_attribs++] = __DRI_CTX_ATTRIB_FLAGS;
+
+ /* The current __DRI_CTX_FLAG_* values are identical to the
+* GLX_CONTEXT_*_BIT values.
+*/
+ ctx_attribs[num_ctx_attribs++] = flags;
+ }
+ }
+
+ context-driContext =
+ (*screen-dri2-createContextAttribs)(screen-driScreen,
+ __DRI_API_OPENGL,
+ config-driConfig,
+ driShare,
+ num_ctx_attribs / 2,
+ ctx_attribs,
+ dri_err,
+ context);
+
+ switch (dri_err) {
+ case
Re: [PATCH 09/11] glx: Use one function to add a context to all global tables
On 01/03/2012 04:28 PM, Jesse Barnes wrote:
On Fri, 23 Dec 2011 15:18:27 -0800
Ian Romanicki...@freedesktop.org wrote:
From: Ian Romanickian.d.roman...@intel.com
Instead of having separate __glXAddContextToList and AddResource
functions, just have one function that does both steps.
Signed-off-by: Ian Romanickian.d.roman...@intel.com
---
glx/glxcmds.c |9 +++--
glx/glxext.c | 10 +-
glx/glxext.h |2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 983f21a..0dce420 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -305,16 +305,13 @@ DoCreateContext(__GLXclientState *cl, GLXContextID gcId,
glxc-drawPriv = NULL;
glxc-readPriv = NULL;
-/*
-** Register this context as a resource.
-*/
-if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) {
+/* Add the new context to the various global tables of GLX contexts.
+ */
+if (!__glXAddContext(glxc)) {
(*glxc-destroy)(glxc);
client-errorValue = gcId;
return BadAlloc;
}
-
-__glXAddToContextList(glxc);
return Success;
}
diff --git a/glx/glxext.c b/glx/glxext.c
index f8fe43b..61eb35b 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -152,10 +152,18 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
return True;
}
-void __glXAddToContextList(__GLXcontext *cx)
+Bool __glXAddContext(__GLXcontext *cx)
{
+/*
+** Register this context as a resource.
+*/
+if (!AddResource(cx-id, __glXContextRes, (pointer)cx)) {
+ return False;
+}
+
cx-next = glxAllContexts;
glxAllContexts = cx;
+return True;
}
static void __glXRemoveFromContextList(__GLXcontext *cx)
diff --git a/glx/glxext.h b/glx/glxext.h
index 58cf054..cb1707d 100644
--- a/glx/glxext.h
+++ b/glx/glxext.h
@@ -38,7 +38,7 @@
extern GLboolean __glXFreeContext(__GLXcontext *glxc);
extern void __glXFlushContextCache(void);
-extern void __glXAddToContextList(__GLXcontext *cx);
+extern Bool __glXAddContext(__GLXcontext *cx);
extern void __glXErrorCallBack(GLenum code);
extern void __glXClearErrorOccured(void);
extern GLboolean __glXErrorOccured(void);
Seems ok, but should you update the corresponding DMX code too?
I don't think so. glxproxy never used __glXAddToContextList, and, as
far as I can tell, it has it's own __glXContextRes (in global.c). I
don't think there should be any interactions here.
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Mesa-dev] [PATCH 20/20] tests/glx: Add unit tests for GLX_ARB_create_context GLX protocol
On 12-01-03 03:27 PM, Ian Romanick wrote: On 01/03/2012 11:13 AM, Mike Lothian wrote: Hi Ever since these tests went in I get failures during configure: configure: creating ./config.status config.status: creating configs/autoconf config.status: error: cannot find input file: `tests/Makefile.in' Before I raise a bug am I doing something stupid? It's possible that I didn't get the automake magic right when gtest isn't installed. Is the program gtest-config in your path? This is usually because tests/Makefile.in did not get generataed by Automake. This is most likely to happen from a tarball where Makefile.in was not distributed. I noticed the toplevel Makefile does not navigate down to the tests subdir, so make dist would probably not include Makefile.in. You have inserted an orphan Automake subdir so there is probably some additional wiring to do. There is a section in the Automake manual to integrate custom makefiles, but I don't know if it covers your scenario. ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xf86-input-evdev] Copy last valuator values into new touch valuator masks
Evdev is a 100% stateful protocol. The following is correct, and
represents a double tap:
ABS_MT_SLOT 0 /* Set touch slot */
ABS_MT_TRACKING_ID 0 /* New touch with ID 0 in slot 0 */
ABS_MT_POSITION_X 500 /* Initial X position */
ABS_MT_POSITION_Y 500 /* Initial Y position */
SYNC/* End of frame */
ABS_MT_TRACKING_ID -1 /* Touch in last slot (0) ended */
SYNC/* End of frame */
ABS_MT_TRACKING_ID 1 /* New touch in last slot (0) with ID 1 */
SYNC/* End of frame */
ABS_MT_TRACKING_ID -1 /* Touch in last slot (0) ended */
SYNC/* End of frame */
Note that touch 1 has the same X and Y position as touch 0. This is
implied because no new value was emitted. In fact, evdev will not emit
an event with the same value as the previous event, even if the driver
reports the event, so we can only assume that all the MT valuators have
the same values as they were when they were last sent.
This change adds a new valuator mask to hold all the last valuator
values that came from evdev. When a new touch begins, all the last
values are copied into it.
Signed-off-by: Chase Douglas chase.doug...@canonical.com
---
src/evdev.c | 14 +-
src/evdev.h |1 +
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/evdev.c b/src/evdev.c
index 82cdb00..0878716 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -760,13 +760,15 @@ EvdevProcessTouchEvent(InputInfoPtr pInfo, struct
input_event *ev)
if (pEvdev-slot_state == SLOTSTATE_EMPTY)
pEvdev-slot_state = SLOTSTATE_UPDATE;
if (ev-code == ABS_MT_TRACKING_ID) {
-if (ev-value = 0)
-pEvdev-slot_state = SLOTSTATE_OPEN;
-else
-pEvdev-slot_state = SLOTSTATE_CLOSE;
+if (ev-value = 0) {
+pEvdev-slot_state = SLOTSTATE_OPEN;
+valuator_mask_copy(pEvdev-mt_mask, pEvdev-last_mt_vals);
+} else
+pEvdev-slot_state = SLOTSTATE_CLOSE;
} else {
map = pEvdev-axis_map[ev-code];
valuator_mask_set(pEvdev-mt_mask, map, ev-value);
+valuator_mask_set(pEvdev-last_mt_vals, map, ev-value);
}
}
}
@@ -1250,7 +1252,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
#ifdef MULTITOUCH
if (num_mt_axes_total 0) {
pEvdev-mt_mask = valuator_mask_new(num_mt_axes_total);
-if (!pEvdev-mt_mask) {
+pEvdev-last_mt_vals = valuator_mask_new(num_mt_axes_total);
+if (!pEvdev-mt_mask || !pEvdev-last_mt_vals) {
xf86Msg(X_ERROR, %s: failed to allocate MT valuator mask.\n,
device-name);
goto out;
@@ -1428,6 +1431,7 @@ out:
valuator_mask_free(pEvdev-prox);
#ifdef MULTITOUCH
valuator_mask_free(pEvdev-mt_mask);
+valuator_mask_free(pEvdev-last_mt_vals);
for (i = 0; i EVDEV_MAXQUEUE; i++)
valuator_mask_free(pEvdev-queue[i].touchMask);
#endif
diff --git a/src/evdev.h b/src/evdev.h
index 1713b89..76043f9 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -158,6 +158,7 @@ typedef struct {
ValuatorMask *old_vals; /* old values for calculating relative motion */
ValuatorMask *prox; /* last values set while not in proximity */
ValuatorMask *mt_mask;
+ValuatorMask *last_mt_vals;
int cur_slot;
enum SlotState slot_state;
#ifdef MULTITOUCH
--
1.7.7.3
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 00/10] Upgrade module configuration and packaging (reposted to .cc)
This module is hosted as an X.Org app and is published as such.
This patch adds some missing packaging files and sets some basic infrastructure
common to all xorg modules which saves maintenance in the long run.
http://www.x.org/wiki/NewModuleGuidelines
This series applies some xorg project policies and code reuse from util-macros.
In some cases it reverts upgrades that were too new for the overall xorg.
There were no bug fixes, things went smoothly.
All the changes done are generic and have been applied/reviewed to all xorg
modules.
Should there be any reasons to deviate, I'd be happy to make appropriate
adjustements
and comments.
Gaetan Nadon (10):
Add mandatory COPYING file.
Use standard .gitignore file and layout
Man pages still showing version 1.0 in the 1.1 release
Add mandatory ChangeLog and INSTALL files
config: remove unrequired AM_PROG_CC_C_O
config: remove duplicate AC_PROG_CC and AC_PROG__CC_99
config: use project wide xorg warnings variable
config: set-up xorg automatic rebuilding rules
config: the minimum version for autoconf is 2.60
config: restore the libtool minimum version to 1.5
.gitignore | 154 +---
COPYING| 108 ++
Makefile.am| 14 ++-
autogen.sh | 14 ++-
benchmarks/.gitignore |5 +
benchmarks/Makefile.am |2 +-
configure.ac | 42 ++
debugger/.gitignore|2 +
debugger/Makefile.am |2 +-
debugger/system_routine/.gitignore |2 +
lib/Makefile.am|2 +-
m4/.gitignore |5 -
man/Makefile.am| 44 --
man/{intel_audio_dump.1 = intel_audio_dump.man} |2 +-
man/{intel_bios_dumper.1 = intel_bios_dumper.man} |2 +-
man/{intel_bios_reader.1 = intel_bios_reader.man} |2 +-
...intel_error_decode.1 = intel_error_decode.man} |2 +-
man/{intel_gpu_top.1 = intel_gpu_top.man} |2 +-
man/{intel_gtt.1 = intel_gtt.man} |2 +-
man/{intel_lid.1 = intel_lid.man} |2 +-
man/{intel_reg_dumper.1 = intel_reg_dumper.man} |2 +-
man/{intel_reg_read.1 = intel_reg_read.man} |2 +-
...intel_reg_snapshot.1 = intel_reg_snapshot.man} |2 +-
man/{intel_reg_write.1 = intel_reg_write.man} |2 +-
man/{intel_stepping.1 = intel_stepping.man} |2 +-
...ad_blit_large.1 = intel_upload_blit_large.man} |2 +-
...large_gtt.1 = intel_upload_blit_large_gtt.man} |2 +-
...large_map.1 = intel_upload_blit_large_map.man} |2 +-
...ad_blit_small.1 = intel_upload_blit_small.man} |2 +-
tests/.gitignore | 51 +++
tests/Makefile.am |2 +-
tools/.gitignore | 20 +++
tools/Makefile.am |2 +-
33 files changed, 336 insertions(+), 167 deletions(-)
create mode 100644 COPYING
create mode 100644 benchmarks/.gitignore
create mode 100644 debugger/.gitignore
create mode 100644 debugger/system_routine/.gitignore
delete mode 100644 m4/.gitignore
rename man/{intel_audio_dump.1 = intel_audio_dump.man} (85%)
rename man/{intel_bios_dumper.1 = intel_bios_dumper.man} (88%)
rename man/{intel_bios_reader.1 = intel_bios_reader.man} (90%)
rename man/{intel_error_decode.1 = intel_error_decode.man} (91%)
rename man/{intel_gpu_top.1 = intel_gpu_top.man} (96%)
rename man/{intel_gtt.1 = intel_gtt.man} (90%)
rename man/{intel_lid.1 = intel_lid.man} (89%)
rename man/{intel_reg_dumper.1 = intel_reg_dumper.man} (93%)
rename man/{intel_reg_read.1 = intel_reg_read.man} (89%)
rename man/{intel_reg_snapshot.1 = intel_reg_snapshot.man} (87%)
rename man/{intel_reg_write.1 = intel_reg_write.man} (89%)
rename man/{intel_stepping.1 = intel_stepping.man} (90%)
rename man/{intel_upload_blit_large.1 = intel_upload_blit_large.man} (90%)
rename man/{intel_upload_blit_large_gtt.1 = intel_upload_blit_large_gtt.man}
(89%)
rename man/{intel_upload_blit_large_map.1 = intel_upload_blit_large_map.man}
(89%)
rename man/{intel_upload_blit_small.1 = intel_upload_blit_small.man} (90%)
create mode 100644 tests/.gitignore
create mode 100644 tools/.gitignore
--
1.7.5.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 01/10] Add mandatory COPYING file.
This module is hosted as an X.Org app and is published as such. This file is a summary of the copyright statements in the source code. http://www.x.org/wiki/NewModuleGuidelines Acked-by: Cyril Brulebois k...@debian.org Reviewed-by: Ben Widawsky b...@bwidawsk.net Signed-off-by: Gaetan Nadon mems...@videotron.ca --- COPYING | 108 +++ 1 files changed, 108 insertions(+), 0 deletions(-) create mode 100644 COPYING diff --git a/COPYING b/COPYING new file mode 100644 index 000..b8f6753 --- /dev/null +++ b/COPYING @@ -0,0 +1,108 @@ +Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +Software), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2003,2006 Tungsten Graphics, Inc., Cedar Park, Texas. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +Software), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright © 2006-2011 Intel Corporation + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the Software), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +IN THE SOFTWARE. + +Copyright © 2010 Red Hat, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the Software), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY,
[PATCH intel-gpu-tools 03/10] Man pages still showing version 1.0 in the 1.1 release
The patch coverts the man subdir to the standard xorg man page makefile.
The version number is automatically updated when a new release is made.
The man page section number is no longer hard coded either.
The package util-macros at version 1.8 or greater is required.
Acked-by: Cyril Brulebois k...@debian.org
Reviewed-by: Ben Widawsky b...@bwidawsk.net
Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
configure.ac |6 ++-
man/.gitignore |1 -
man/Makefile.am| 44 ---
man/{intel_audio_dump.1 = intel_audio_dump.man} |2 +-
man/{intel_bios_dumper.1 = intel_bios_dumper.man} |2 +-
man/{intel_bios_reader.1 = intel_bios_reader.man} |2 +-
...intel_error_decode.1 = intel_error_decode.man} |2 +-
man/{intel_gpu_top.1 = intel_gpu_top.man} |2 +-
man/{intel_gtt.1 = intel_gtt.man} |2 +-
man/{intel_lid.1 = intel_lid.man} |2 +-
man/{intel_reg_dumper.1 = intel_reg_dumper.man} |2 +-
man/{intel_reg_read.1 = intel_reg_read.man} |2 +-
...intel_reg_snapshot.1 = intel_reg_snapshot.man} |2 +-
man/{intel_reg_write.1 = intel_reg_write.man} |2 +-
man/{intel_stepping.1 = intel_stepping.man} |2 +-
...ad_blit_large.1 = intel_upload_blit_large.man} |2 +-
...large_gtt.1 = intel_upload_blit_large_gtt.man} |2 +-
...large_map.1 = intel_upload_blit_large_map.man} |2 +-
...ad_blit_small.1 = intel_upload_blit_small.man} |2 +-
19 files changed, 48 insertions(+), 35 deletions(-)
delete mode 100644 man/.gitignore
rename man/{intel_audio_dump.1 = intel_audio_dump.man} (85%)
rename man/{intel_bios_dumper.1 = intel_bios_dumper.man} (88%)
rename man/{intel_bios_reader.1 = intel_bios_reader.man} (90%)
rename man/{intel_error_decode.1 = intel_error_decode.man} (91%)
rename man/{intel_gpu_top.1 = intel_gpu_top.man} (96%)
rename man/{intel_gtt.1 = intel_gtt.man} (90%)
rename man/{intel_lid.1 = intel_lid.man} (89%)
rename man/{intel_reg_dumper.1 = intel_reg_dumper.man} (93%)
rename man/{intel_reg_read.1 = intel_reg_read.man} (89%)
rename man/{intel_reg_snapshot.1 = intel_reg_snapshot.man} (87%)
rename man/{intel_reg_write.1 = intel_reg_write.man} (89%)
rename man/{intel_stepping.1 = intel_stepping.man} (90%)
rename man/{intel_upload_blit_large.1 = intel_upload_blit_large.man} (90%)
rename man/{intel_upload_blit_large_gtt.1 = intel_upload_blit_large_gtt.man}
(89%)
rename man/{intel_upload_blit_large_map.1 = intel_upload_blit_large_map.man}
(89%)
rename man/{intel_upload_blit_small.1 = intel_upload_blit_small.man} (90%)
diff --git a/configure.ac b/configure.ac
index 5d89b30..dd3752b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,8 +97,10 @@ if test x$SHADER_DEBUGGER = xyes; then
fi
fi
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or
later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.8 or later before running
autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AC_CONFIG_FILES([
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index af65d61..000
--- a/man/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!*.1
diff --git a/man/Makefile.am b/man/Makefile.am
index 5187abd..2b54195 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,16 +1,28 @@
-dist_man1_MANS = \
- intel_audio_dump.1 \
- intel_bios_dumper.1 \
- intel_bios_reader.1 \
- intel_error_decode.1 \
- intel_gpu_top.1 \
- intel_gtt.1 \
- intel_lid.1 \
- intel_reg_dumper.1 \
- intel_reg_read.1 \
- intel_reg_write.1 \
- intel_stepping.1 \
- intel_upload_blit_large.1 \
- intel_upload_blit_large_gtt.1 \
- intel_upload_blit_large_map.1 \
- intel_upload_blit_small.1
+appmandir = $(APP_MAN_DIR)
+appman_PRE = \
+ intel_audio_dump.man\
+ intel_bios_dumper.man \
+ intel_bios_reader.man \
+ intel_error_decode.man \
+ intel_gpu_top.man \
+ intel_gtt.man \
+ intel_lid.man \
+ intel_reg_dumper.man\
+ intel_reg_read.man \
+ intel_reg_write.man \
+ intel_stepping.man \
+ intel_upload_blit_large.man \
+ intel_upload_blit_large_gtt.man \
+ intel_upload_blit_large_map.man \
+ intel_upload_blit_small.man
+
+appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
+
+EXTRA_DIST = $(appman_PRE)
+CLEANFILES = $(appman_DATA)
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+SUFFIXES = .$(APP_MAN_SUFFIX)
[PATCH intel-gpu-tools 04/10] Add mandatory ChangeLog and INSTALL files
These are generated from a macro in the util-macros package
Refer to the wiki for more details.
http://www.x.org/wiki/NewModuleGuidelines.
Acked-by: Cyril Brulebois k...@debian.org
Reviewed-by: Ben Widawsky b...@bwidawsk.net
Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
Makefile.am | 12
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 6c57b83..c7ae735 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,3 +27,15 @@ SUBDIRS = lib man tools scripts tests benchmarks
$(SHADER_DEBUGGER_SUBDIR)
test:
${MAKE} -C tests test
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
--
1.7.5.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 05/10] config: remove unrequired AM_PROG_CC_C_O
Required when using per-target flags or subdir-objects with C sources. http://www.gnu.org/software/automake/manual/automake.html Signed-off-by: Gaetan Nadon mems...@videotron.ca --- configure.ac |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index dd3752b..185433c 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # Checks for programs. AC_PROG_CC AC_PROG_CC_C99 -AM_PROG_CC_C_O # Initialize libtool LT_PREREQ([2.2]) -- 1.7.5.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 06/10] config: remove duplicate AC_PROG_CC and AC_PROG__CC_99
The compiler was configured three times. It is done once by XORG_DEFAULT_OPTIONS in util-macros. Signed-off-by: Gaetan Nadon mems...@videotron.ca --- configure.ac | 21 ++--- 1 files changed, 6 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 185433c..3e3e7d4 100644 --- a/configure.ac +++ b/configure.ac @@ -34,19 +34,16 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) AM_MAINTAINER_MODE([enable]) -# Support silent build rules, requires at least automake-1.11. Disable -# by either passing --disable-silent-rules to configure or passing V=1 -# to make -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -# Checks for programs. -AC_PROG_CC -AC_PROG_CC_C99 - # Initialize libtool LT_PREREQ([2.2]) LT_INIT([disable-static]) +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) +XORG_DEFAULT_OPTIONS + PKG_CHECK_MODULES(DRM, [libdrm_intel = 2.4.23 libdrm]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess = 0.10]) @@ -96,12 +93,6 @@ if test x$SHADER_DEBUGGER = xyes; then fi fi -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS - AC_CONFIG_FILES([ Makefile benchmarks/Makefile -- 1.7.5.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 07/10] config: use project wide xorg warnings variable
Use CWARNFLAGS as in all of xorg. There seems to be no reason why this module should be different. The warnings were updated recently for those who install the latest util-macros. Signed-off-by: Gaetan Nadon mems...@videotron.ca --- benchmarks/Makefile.am |2 +- configure.ac | 12 debugger/Makefile.am |2 +- lib/Makefile.am|2 +- tests/Makefile.am |2 +- tools/Makefile.am |2 +- 6 files changed, 5 insertions(+), 17 deletions(-) diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 654946a..bc0a533 100644 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -18,6 +18,6 @@ intel_upload_blit_large_gtt_LDADD = $(BENCHMARK_LIBS) intel_upload_blit_large_map_LDADD = $(BENCHMARK_LIBS) intel_upload_blit_small_LDADD = $(BENCHMARK_LIBS) -AM_CFLAGS = $(DRM_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib diff --git a/configure.ac b/configure.ac index 3e3e7d4..8515dca 100644 --- a/configure.ac +++ b/configure.ac @@ -65,18 +65,6 @@ if test x$HAVE_GLIB = xyes; then fi AM_CONDITIONAL(HAVE_GLIB, [test x$HAVE_GLIB = xyes]) -dnl Use lots of warning flags with GCC - -WARN_CFLAGS= - -if test x$GCC = xyes; then - WARN_CFLAGS=-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing -fi - -AC_SUBST([WARN_CFLAGS]) - AC_ARG_ENABLE(shader-debugger, AS_HELP_STRING([--enable-shader-debugger], [Enable shader debugging support [default=no]]), diff --git a/debugger/Makefile.am b/debugger/Makefile.am index 9c89a55..7d914ec 100644 --- a/debugger/Makefile.am +++ b/debugger/Makefile.am @@ -14,6 +14,6 @@ bin_PROGRAMS += \ endif LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib diff --git a/lib/Makefile.am b/lib/Makefile.am index 12a2727..ca93410 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ NULL=# -AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/.. +AM_CFLAGS = $(CWARNFLAGS) -I$(srcdir)/.. libintel_tools_la_SOURCES = \ intel_batchbuffer.h \ intel_batchbuffer.c \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 43d7db6..770243a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -88,7 +88,7 @@ EXTRA_PROGRAMS = $(TESTS_progs) $(HANG) EXTRA_DIST = $(TESTS_scripts) check_drm_clients CLEANFILES = $(EXTRA_PROGRAMS) -AM_CFLAGS = $(DRM_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) diff --git a/tools/Makefile.am b/tools/Makefile.am index 0527ade..4969a11 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -43,6 +43,6 @@ EXTRA_DIST = $(bin_SCRIPTS) LDADD = ../lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS) -AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \ +AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ -I$(srcdir)/../lib -- 1.7.5.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 08/10] config: set-up xorg automatic rebuilding rules
The current code is a noop. Use the same configuration as all the other xorg modules. This will change in the future but it is less confusing when all modules behave the same way. Note that these rules apply to building from a tarball only. Restore autogen.sh to be identical in all xorg modules. Signed-off-by: Gaetan Nadon mems...@videotron.ca --- autogen.sh | 14 ++ configure.ac |2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 30d679f..904cd67 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,12 @@ #! /bin/sh -test -n $srcdir || srcdir=`dirname $0` -test -n $srcdir || srcdir=. -autoreconf --force --install --verbose $srcdir -test -n $NOCONFIGURE || $srcdir/configure $@ +srcdir=`dirname $0` +test -z $srcdir srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode $@ diff --git a/configure.ac b/configure.ac index 8515dca..73a9e29 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) -AM_MAINTAINER_MODE([enable]) +AM_MAINTAINER_MODE # Initialize libtool LT_PREREQ([2.2]) -- 1.7.5.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 09/10] config: the minimum version for autoconf is 2.60
A version later than 2.60 can be used, but no new features from such a later version can be used in configure.ac. The toolchain version requirements are documented here: http://www.x.org/wiki/ModularDevelopersGuide#GNU_Build_System Minimum version for Automake is 1.10 but we have not written it in any xorg module so far and there has been no issues. Signed-off-by: Gaetan Nadon mems...@videotron.ca --- configure.ac |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 73a9e29..2715fbf 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # # Process this file with autoconf to produce a configure script -AC_PREREQ([2.63]) +AC_PREREQ([2.60]) AC_INIT([intel-gpu-tools], [1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], @@ -31,7 +31,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Initialize libtool -- 1.7.5.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH intel-gpu-tools 10/10] config: restore the libtool minimum version to 1.5
Very few systems still use this old version, but it would be inconvenient to build a video driver with libtool 1.5 and have to build the gpu tools on another system having libtool 2.2. The toolchain version requirements are documented here: http://www.x.org/wiki/ModularDevelopersGuide#GNU_Build_System Signed-off-by: Gaetan Nadon mems...@videotron.ca --- configure.ac |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 2715fbf..b415a97 100644 --- a/configure.ac +++ b/configure.ac @@ -35,8 +35,8 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE # Initialize libtool -LT_PREREQ([2.2]) -LT_INIT([disable-static]) +AC_DISABLE_STATIC +AC_PROG_LIBTOOL # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], -- 1.7.5.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH intel-gpu-tools 00/10] Upgrade module configuration - Part 2
On Mon, 02 Jan 2012 18:23:15 -0500, Gaetan Nadon mems...@videotron.ca wrote: This series applies some xorg project policies and code reuse from util-macros. In some cases it reverts upgrades that were too new for the overall xorg. There were no bug fixes, things went smoothly. Both series for updates to automake infrastructure for this project are Acked-by: Eric Anholt e...@anholt.net I think I cribbed from xf86-video-intel when I originally did this stuff, and I didn't mean for it to be gratuitously different from our other projects, as I recall. pgp15r1mBdcSV.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH sis] Use miPointerSetPosition, not miPointerAbsoluteCursor
miPointerAbsoluteCursor was removed in '09.
Technically this shouldn't just work on the VCP since any master pointer may
end up in the dead area. However, I suspect the Venn diagramm of MPX users
and sis merged framebuffer users shows little overlap.
miPointerSetPosition's prototype changed a few times, these are a bunch of
untested ifdefs that should be correct according to the git history.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
I do wonder why I bothered. The way I read this is that this code would have
had unresolved symbols since server 1.6 and no-one complained.
src/sis_driver.c | 19 ++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 6f7a15e..3218239 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -85,6 +85,10 @@
#include X11/extensions/dpms.h
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 15
+#include inputstr.h /* for inputInfo */
+#endif
+
#ifdef XF86DRI
#include dri.h
@@ -9346,9 +9350,22 @@ SISMergedPointerMoved(int scrnIndex, int x, int y)
}
}
if(doit) {
- UpdateCurrentTime();
sigstate = xf86BlockSIGIO();
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 15
+{
+double dx = x, dy = y;
+miPointerSetPosition(inputInfo.pointer, Absolute, dx, dy);
+x = (int)dx;
+y = (int)dy;
+}
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 11
+ miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 5
+ miPointerSetPosition(inputInfo.pointer, x, y);
+#else
+ UpdateCurrentTime();
miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
+#endif
xf86UnblockSIGIO(sigstate);
return;
}
--
1.7.7.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Mesa-dev] [PATCH 20/20] tests/glx: Add unit tests for GLX_ARB_create_context GLX protocol
On 01/03/2012 06:06 PM, Mike Lothian wrote: On 3 January 2012 20:27, Ian Romanicki...@freedesktop.org wrote: On 01/03/2012 11:13 AM, Mike Lothian wrote: Hi Ever since these tests went in I get failures during configure: configure: creating ./config.status config.status: creating configs/autoconf config.status: error: cannot find input file: `tests/Makefile.in' Before I raise a bug am I doing something stupid? It's possible that I didn't get the automake magic right when gtest isn't installed. Is the program gtest-config in your path? I still get the issue even if I uninstall gtest I notice the log also contains: /bin/sh: /var/tmp/portage/media-libs/mesa-/work/Mesa-/bin/missing: No such file or directory configure: WARNING: `missing' script is too old or missing and I'm attaching the full build log too if that helps You should build from GIT, not from some tarball. I think Gaetan was correct. Some files aren't getting into the tarball. I'll have to fix that later, but I have much bigger fish to try in the mean time. ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH sis] Untangle XF86DRI from the driver-specific DRI define
XF86DRI is defined by xorg-server.h, so --disable-dri in the sis driver
itself does exactly nothing other than not fill in the CFLAGS and thus stop
the driver from compiling.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
configure.ac |4 ++--
src/sis.h| 16 +++-
src/sis_dri.c|2 +-
src/sis_driver.c | 14 +++---
src/sis_opt.c|4 ++--
5 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 036a448..a599108 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,8 +99,8 @@ AC_MSG_RESULT([$DRI])
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test $DRI = yes; then
PKG_CHECK_MODULES(DRI, [libdrm = 2.0 xf86driproto])
-AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
-AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
+AC_DEFINE(SISDRI,1,[Enable DRI driver support])
+AC_DEFINE(SIDDRI_DEVEL,1,[Enable developmental DRI driver support])
fi
# technically this should be a configure flag. meh.
diff --git a/src/sis.h b/src/sis.h
index 9af31a5..f2ca3a9 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -181,7 +181,13 @@
#undef SISHAVEDRMWRITE
#undef SISNEWDRI
-#ifdef XF86DRI
+
+/* if the server was built without DRI support, force-disable DRI */
+#ifndef XF86DRI
+#undef SISDRI
+#endif
+
+#ifdef SISDRI
#if XF86_VERSION_CURRENT = XF86_VERSION_NUMERIC(4,2,99,3,0)
#define SISHAVEDRMWRITE
#endif
@@ -195,7 +201,7 @@
#include dri.h
#include GL/glxint.h
#include sis_dri.h
-#endif /* XF86DRI */
+#endif /* SISDRI */
/* Configurable stuff: - */
@@ -812,7 +818,7 @@ typedef struct {
ScrnInfoPtrpScrn_2;
UChar *BIOS;
struct SiS_Private *SiS_Pr;
-#ifdef XF86DRI
+#ifdef SISDRI
SISAGPHTYPEagpHandle;
ULong agpAddr;
UChar *agpBase;
@@ -1092,7 +1098,7 @@ typedef struct {
unsigned int cmdQueueSize_div2;
unsigned int cmdQueueSize_div4;
unsigned int cmdQueueSize_4_3;
-#ifdef XF86DRI
+#ifdef SISDRI
SISAGPHTYPEagpHandle;
ULong agpAddr;
UChar *agpBase;
@@ -1151,7 +1157,7 @@ typedef struct {
/* DRI */
Bool loadDRI;
-#ifdef XF86DRI
+#ifdef SISDRI
Bool directRenderingEnabled;
DRIInfoPtr pDRIInfo;
intdrmSubFD;
diff --git a/src/sis_dri.c b/src/sis_dri.c
index 97ed951..d0c4fba 100644
--- a/src/sis_dri.c
+++ b/src/sis_dri.c
@@ -369,7 +369,7 @@ SISDRIScreenInit(ScreenPtr pScreen)
*/
pDRIInfo-SAREASize =
((sizeof(XF86DRISAREARec) + getpagesize() - 1) getpagesize()); /* round
to page */
-/* ((sizeof(XF86DRISAREARec) + 0xfff) 0x1000); */ /* round to page */
+/* ((sizeof(SISDRISAREARec) + 0xfff) 0x1000); */ /* round to page */
/* + shared memory device private rec */
#else
/* For now the mapping works by using a fixed size defined
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 3218239..d733f48 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -90,7 +90,7 @@
#endif
-#ifdef XF86DRI
+#ifdef SISDRI
#include dri.h
#endif
@@ -6895,7 +6895,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
}
/* Load the dri and glx modules if requested. */
-#ifdef XF86DRI
+#ifdef SISDRI
if(pSiS-loadDRI) {
if(!xf86LoaderCheckSymbol(DRIScreenInit)) {
if(xf86LoadSubModule(pScrn, dri)) {
@@ -8731,7 +8731,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
char **argv)
pSiS-cmdQueueLen = 0; /* Force an EngineIdle() at start */
-#ifdef XF86DRI
+#ifdef SISDRI
if(pSiS-loadDRI) {
#ifdef SISDUALHEAD
/* No DRI in dual head mode */
@@ -9044,7 +9044,7 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
char **argv)
}
#endif
-#ifdef XF86DRI
+#ifdef SISDRI
if(pSiS-loadDRI) {
if(pSiS-directRenderingEnabled) {
/* Now that mi, drm and others have done their thing,
@@ -9778,7 +9778,7 @@ SISEnterVT(int scrnIndex, int flags)
SISAdjustFrame(scrnIndex, pScrn-frameX0, pScrn-frameY0, 0);
-#ifdef XF86DRI
+#ifdef SISDRI
if(pSiS-directRenderingEnabled) {
DRIUnlock(screenInfo.screens[scrnIndex]);
}
@@ -9804,7 +9804,7 @@ SISLeaveVT(int scrnIndex, int flags)
{
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
SISPtr pSiS = SISPTR(pScrn);
-#ifdef XF86DRI
+#ifdef SISDRI
ScreenPtr pScreen;
if(pSiS-directRenderingEnabled) {
@@ -9888,7 +9888,7 @@ SISCloseScreen(int scrnIndex, ScreenPtr pScreen)
SiSCtrlExtUnregister(pSiS, pScrn-scrnIndex);
}
-#ifdef XF86DRI
+#ifdef SISDRI
if(pSiS-directRenderingEnabled) {
SISDRICloseScreen(pScreen);
pSiS-directRenderingEnabled = FALSE;
diff --git a/src/sis_opt.c b/src/sis_opt.c
index d39ff6e..3fa12c9 100644
--- a/src/sis_opt.c
+++ b/src/sis_opt.c
@@ -480,7
[PATCH] mi/mibitblt: Fix an overflow bug of bit shift.
From: Zhigang Gong zhigang.g...@linux.intel.com
When depth equal to 32 and planeMask equal to 0, the overflow will
occur and cause the pixmap can't be cleared. There are some test
cases in XTS hit this bug, and this fix can eliminate the corresponding
failures.
Signed-off-by: Zhigang Gong zhigang.g...@linux.intel.com
---
mi/mibitblt.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index 2dfff14..fc6eb8d 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -648,7 +648,7 @@ miGetImage( DrawablePtr pDraw, int sx, int sy, int w, int h,
depth = pDraw-depth;
if(format == ZPixmap)
{
- if ( (((1depth)-1)planeMask) != (1depth)-1 )
+ if ( (((1LLdepth)-1)planeMask) != (1LLdepth)-1 )
{
ChangeGCVal gcv;
xPoint pt;
--
1.7.4.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Mesa-dev] [PATCH 20/20] tests/glx: Add unit tests for GLX_ARB_create_context GLX protocol
Hi Ever since these tests went in I get failures during configure: configure: creating ./config.status config.status: creating configs/autoconf config.status: error: cannot find input file: `tests/Makefile.in' Before I raise a bug am I doing something stupid? Cheers Mike ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Mesa-dev] [PATCH 20/20] tests/glx: Add unit tests for GLX_ARB_create_context GLX protocol
On 3 January 2012 20:27, Ian Romanick i...@freedesktop.org wrote: On 01/03/2012 11:13 AM, Mike Lothian wrote: Hi Ever since these tests went in I get failures during configure: configure: creating ./config.status config.status: creating configs/autoconf config.status: error: cannot find input file: `tests/Makefile.in' Before I raise a bug am I doing something stupid? It's possible that I didn't get the automake magic right when gtest isn't installed. Is the program gtest-config in your path? Yes I have gtest-config in my path - it was apparently pulled in by gmock which is required by Clementine Should I un-install these, pass a configure parameter to mesa or is there something extra required in the automake hocus pocus? ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Mesa-dev] [PATCH 20/20] tests/glx: Add unit tests for GLX_ARB_create_context GLX protocol
On 3 January 2012 20:27, Ian Romanick i...@freedesktop.org wrote: On 01/03/2012 11:13 AM, Mike Lothian wrote: Hi Ever since these tests went in I get failures during configure: configure: creating ./config.status config.status: creating configs/autoconf config.status: error: cannot find input file: `tests/Makefile.in' Before I raise a bug am I doing something stupid? It's possible that I didn't get the automake magic right when gtest isn't installed. Is the program gtest-config in your path? I still get the issue even if I uninstall gtest I notice the log also contains: /bin/sh: /var/tmp/portage/media-libs/mesa-/work/Mesa-/bin/missing: No such file or directory configure: WARNING: `missing' script is too old or missing and I'm attaching the full build log too if that helps [32;01m * [39;49;00mPackage:media-libs/mesa- [32;01m * [39;49;00mRepository: x11 [32;01m * [39;49;00mMaintainer: x...@gentoo.org [32;01m * [39;49;00mUSE:amd64 classic consolekit egl elibc_glibc g3dvl gallium gbm gles2 kernel_linux llvm multilib nptl openvg policykit shared-dricore shared-glapi userland_GNU video_cards_i965 video_cards_r600 xvmc [32;01m * [39;49;00mFEATURES: sandbox Unpacking source... GIT update -- repository: git://anongit.freedesktop.org/mesa/mesa at the commit:7e291e922e53a70d84751538b15c6c16310cca7f branch: master storage directory:/usr/portage/distfiles/egit-src/mesa checkout type:bare repository Cloning into '/var/tmp/portage/media-libs/mesa-/work/Mesa-'... done. Branch branch-master set up to track remote branch master from origin. Switched to a new branch 'branch-master' Unpacked to /var/tmp/portage/media-libs/mesa-/work/Mesa- Source unpacked in /var/tmp/portage/media-libs/mesa-/work Preparing source in /var/tmp/portage/media-libs/mesa-/work/Mesa- ... [32;01m*[0m Running eautoreconf in '/var/tmp/portage/media-libs/mesa-/work/Mesa-' ... [32;01m*[0m Running aclocal ... [A[184C [34;01m[ [32;01mok[34;01m ][0m [32;01m*[0m Running autoconf ... [A[184C [34;01m[ [32;01mok[34;01m ][0m Source prepared. Configuring source in /var/tmp/portage/media-libs/mesa-/work/Mesa- ... * econf: updating Mesa-/bin/config.sub with /usr/share/gnuconfig/config.sub * econf: updating Mesa-/bin/config.guess with /usr/share/gnuconfig/config.guess ./configure --prefix=/usr --build=x86_64-pc-linux-gnu --host=x86_64-pc-linux-gnu --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --libdir=/usr/lib64 --disable-dependency-tracking --disable-option-checking --enable-dri --enable-glx --enable-xcb --enable-texture-float --disable-debug --enable-egl --enable-gbm --disable-gles1 --enable-gles2 --enable-glx-tls --disable-osmesa --enable-asm --enable-shared-dricore --enable-shared-glapi --with-dri-drivers=,swrast,i965 --with-gallium-drivers=,swrast,r600 --with-egl-platforms=x11,drm --enable-gallium-egl --disable-d3d1x --enable-gallium-g3dvl --enable-gallium-llvm --enable-openvg --disable-vdpau --enable-xvmc checking build system type... x86_64-pc-linux-gnu checking host system type... x86_64-pc-linux-gnu checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes /bin/sh: /var/tmp/portage/media-libs/mesa-/work/Mesa-/bin/missing: No such file or directory configure: WARNING: `missing' script is too old or missing checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking for style of include used by make... GNU checking for x86_64-pc-linux-gnu-gcc... x86_64-pc-linux-gnu-gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether x86_64-pc-linux-gnu-gcc accepts -g... yes checking for x86_64-pc-linux-gnu-gcc option to accept ISO C89... none needed checking dependency style of x86_64-pc-linux-gnu-gcc... none checking how to run the C preprocessor... x86_64-pc-linux-gnu-gcc -E checking for x86_64-pc-linux-gnu-gcc... (cached) x86_64-pc-linux-gnu-gcc checking whether we are using the GNU C compiler... (cached) yes checking whether x86_64-pc-linux-gnu-gcc accepts -g... (cached) yes checking for x86_64-pc-linux-gnu-gcc option to accept ISO C89... (cached) none needed checking dependency style of x86_64-pc-linux-gnu-gcc... (cached) none checking for x86_64-pc-linux-gnu-g++... x86_64-pc-linux-gnu-g++ checking whether we are using the GNU C++ compiler... yes checking whether x86_64-pc-linux-gnu-g++ accepts -g... yes checking dependency style of x86_64-pc-linux-gnu-g++... none checking for gmake... gmake checking for
