x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

[maintenancescripts] branch master updated (c5a9f52 -> 5cb7a62)
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from c5a9f52 git/hooks/update-irkerhook_only: delete garbage. new 4df078b git/hooks/update-script._irkerhook.py_: fix color parsing for rebase message. new 5cb7a62 git/hooks/update-script._irkerhook.py_: correctly get parent in a rebase. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update-script._irkerhook.py_ | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

1 2

[maintenancescripts] branch master updated (edaf614 -> c5a9f52)
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. discards edaf614 git/hooks/update-irkerhook_only: add more garbage. new c5a9f52 git/hooks/update-irkerhook_only: delete garbage. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (edaf614) \ N -- N -- N refs/heads/master (c5a9f52) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update-irkerhook_only | 3 --- 1 file changed, 3 deletions(-) -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

1 1

[maintenancescripts] branch master updated (d578c6b -> edaf614)
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from d578c6b git/hooks/update-script._irkerhook.py_: fix syntax error... new edaf614 git/hooks/update-irkerhook_only: add more garbage. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update-irkerhook_only | 1 + 1 file changed, 1 insertion(+) -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

1 1

[maintenancescripts] branch master updated (104278f -> d578c6b)
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from 104278f git/hooks/update-irkerhook_only: add garbage. new d578c6b git/hooks/update-script._irkerhook.py_: fix syntax error... The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update-script._irkerhook.py_ | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

1 1

[maintenancescripts] branch master updated (289c63c -> 104278f)
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from 289c63c git/hooks/update-irkerhook_only: make merge- and rebase-aware. Don't flood the channel. new 104278f git/hooks/update-irkerhook_only: add garbage. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update-irkerhook_only | 2 ++ 1 file changed, 2 insertions(+) -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

1 1

[maintenancescripts] branch master updated (510e874 -> 289c63c)
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from 510e874 git/hooks/common.sh: use lower case typeset attribute if using bash anyway. new 35cfe30 git/hooks/update-script._irkerhook.py_: add experimental rebase support. new 24dbdab git/hooks/update{,-merge}: move irkerhook logic to git/hooks/update-irkerhook_only. new 289c63c git/hooks/update-irkerhook_only: make merge- and rebase-aware. Don't flood the channel. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update | 4 +--- git/hooks/update-irkerhook_only | 30 +++++++++++++++++++++++++++--- git/hooks/update-merge | 4 +--- git/hooks/update-script._irkerhook.py_ | 11 ++++++++++- 4 files changed, 39 insertions(+), 10 deletions(-) -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git

1 3

[x2goclient] branch bugfix/osx updated (1316647 -> ad6ce0f)
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx in repository x2goclient. discards 1316647 compat.h: include QtCore/qglobal.h for Q_OS_... macros. discards a6f2b3d compat.{cpp,h}: remove inline keyword, because function is not defined in header file. discards 2ee5850 compat.{cpp,h}: new files. Implements strndup on OS X 10.6 and below. Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo. discards 8ae75d7 onmainwindow.cpp: correctly use ~/.x2go/.ssh as ssh directory when starting sshd in user mode. discards bab5e5d appdialog.cpp: initialize parent in default case. Another GCC compile warning fix. discards 01351e8 {appdialog,configwidget,onmainwindow,unixhelper}.cpp: fix some compile warnings with GCC. Fix a few whitespace issues. discards 52a7757 x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector. discards 38a268f unixhelper.{cpp,h}: ignore SIGINT, SIGTERM, SIGPIPE, SIGQUIT, SIGUSR1 and SIGUSR2. discards ad7a0d8 {unixhelper.{cpp,h},x2goclient.cpp}: switch main cleanup handling to parent PID polling. discards 53a1864 unixhelper.{cpp,h}: raise sleeping time to two seconds and grace period to 10 seconds. discards cc23655 x2goclient.cpp: create new argv array on the heap instead of on the stack. discards eedcb39 x2goclient.cpp: fix string comparison. discards 9e8335b x2goclient.cpp: fix compile problems introduced with the last commit. discards cafcd46 x2goclient.cpp: don't start the UNIX cleanup helper process right after forking. discards 35501f2 x2goclient.cpp: clean up. discards 525be63 unixhelper.cpp: port from std::signal() to sigactio(). Handle errors. discards 3b17a71 unixhelper.{cpp,h}: implement signal unblocking in unixhelper::unix_cleanup(). Update documentation. discards 7e908a2 unixhelper.cpp: kill process group on error. discards eab2927 x2goclient.cpp: return return value of unixhelper::unix_cleanup(). discards a08e210 unixhelper.{cpp,h}: add documentation/comments. discards 945f3fe unixhelper.{cpp,h},x2goclient.cpp}: unixhelper should really be a (module) namespace, not a class. discards 1c04711 unixhelper.h: forgot to declare type of unix_cleanup() function. discards c338198 unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around. discards d9227c1 x2goclient.cpp: fix std::edit -> std::exit typo. discards 7fdb0a9 x2goclient.cpp: add legacy <sys/types.h> header needed for old operating systems. discards fbf81f1 x2goclient.cpp: add myself to copyright header. discards 7d6bd56 x2goclient.cpp: use setsid() on UNIX to become session and process group leader. discards 53e349f x2goclient.cpp: add fork_helper() function to start up the UNIX cleanup helper. discards 33554ac x2goclient.cpp: wrap X2Go Client main function and use that. discards c1071f6 unixhelper.{cpp,h}: implement cleanup program for process group. discards d37b446 {unixhelper.{cpp,h},x2goclient.pro{maemo}}: add unixhelper stub. adds 4a7c05b {{configdialog,onmainwindow}.cpp,x2goutils.{cpp,h}}: new helper functions show_XQuartz_not_found_error(), show_XQuartz_start_error() and show_XQuartz_generic_error(). adds c11e697 x2goutils.cpp: fix compile error. tr () is a member of QObject and must be explicitly marked as such in a free function. adds e7f48c2 {configdialog.{cpp,h},onmainwindow.cpp}: miscellaneous typo fixes - no functional changes. new 3b4baf7 {unixhelper.{cpp,h},x2goclient.pro{maemo}}: add unixhelper stub. new 2ca3888 unixhelper.{cpp,h}: implement cleanup program for process group. new 2342b1a x2goclient.cpp: wrap X2Go Client main function and use that. new 3eceed0 x2goclient.cpp: add fork_helper() function to start up the UNIX cleanup helper. new 1bbc9ad x2goclient.cpp: use setsid() on UNIX to become session and process group leader. new 4664b3a x2goclient.cpp: add myself to copyright header. new b8c1bce x2goclient.cpp: add legacy <sys/types.h> header needed for old operating systems. new 3d74320 x2goclient.cpp: fix std::edit -> std::exit typo. new 6849e70 unixhelper.{h,cpp}: also include <QtCore/qglobal.h> to have Q_OS_UNIX defined on UNIX-based platforms. Move guards around. new dc06387 unixhelper.h: forgot to declare type of unix_cleanup() function. new 81bd31a unixhelper.{cpp,h},x2goclient.cpp}: unixhelper should really be a (module) namespace, not a class. new 6df201f unixhelper.{cpp,h}: add documentation/comments. new d517a8b x2goclient.cpp: return return value of unixhelper::unix_cleanup(). new bd681c8 unixhelper.cpp: kill process group on error. new c871c5d unixhelper.{cpp,h}: implement signal unblocking in unixhelper::unix_cleanup(). Update documentation. new 6abd6e0 unixhelper.cpp: port from std::signal() to sigaction(). Handle errors. new a125984 x2goclient.cpp: clean up. new cd295e6 x2goclient.cpp: don't start the UNIX cleanup helper process right after forking. new 893eeb0 x2goclient.cpp: fix compile problems introduced with the last commit. new 63ddc7d x2goclient.cpp: fix string comparison. new a3c081d x2goclient.cpp: create new argv array on the heap instead of on the stack. new bb5054d unixhelper.{cpp,h}: raise sleeping time to two seconds and grace period to 10 seconds. new 5653f51 {unixhelper.{cpp,h},x2goclient.cpp}: switch main cleanup handling to parent PID polling. new 7de4aa5 unixhelper.{cpp,h}: ignore SIGINT, SIGTERM, SIGPIPE, SIGQUIT, SIGUSR1 and SIGUSR2. new fd3b1a5 x2goclient.cpp: fix failing exec() call for the UNIX helper utility: correctly terminate arguments vector. new b19550f {appdialog,configwidget,onmainwindow,unixhelper}.cpp: fix some compile warnings with GCC. Fix a few whitespace issues. new 4fdc15e appdialog.cpp: initialize parent in default case. Another GCC compile warning fix. new f0afa73 onmainwindow.cpp: correctly use ~/.x2go/.ssh as ssh directory when starting sshd in user mode. new 43199d8 compat.{cpp,h}: new files. Implements strndup on OS X 10.6 and below. Add to x2goclient.cpp, x2goclient.pro and x2goclient.pro.maemo. new 17099d4 compat.{cpp,h}: remove inline keyword, because function is not defined in header file. new b1dfc68 compat.h: include QtCore/qglobal.h for Q_OS_... macros. new 0c2fc6f pulsemanager.{cpp,h}: new class for PulseAudio management. new fc19ca2 x2goclient.pro{maemo}: reference new pulsemanager.{cpp,h} files. new cf9039b macbuild.sh: add new MACPORTS_PREFIX detection/variable. new 882ecca macbuild.sh: add new dependency_error() helper function. new 6735405 macbuild.sh: add new lazy_canonical_path() helper function. new 2c7b86b macbuild.sh: add new get_nesting_level() helper function. new c173543 macbuild.sh: add new repeat_str() helper function. new 4b92498 macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX. new 2de60de macbuild.sh: add EXE_DIR and FRAMEWORKS_DIR internal variables. new 5065f77 macbuild.sh: define PulseAudio libraries and binaries to be later copied. new cbfbc40 macbuild.sh: copy PulseAudio libraries and binaries. new 47a11aa macbuild.sh: add phase output for bundling nxproxy. new ad6ce0f macbuild.sh: add work-in-progress PulseAudio bundling. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1316647) \ N -- N -- N refs/heads/bugfix/osx (ad6ce0f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 44 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 28 ++++++ macbuild.sh | 194 +++++++++++++++++++++++++++++++++++- src/configdialog.cpp | 23 +---- src/configdialog.h | 2 +- src/onmainwindow.cpp | 9 +- src/pulsemanager.cpp | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/pulsemanager.h | 92 +++++++++++++++++ src/x2goutils.cpp | 41 ++++++++ src/x2goutils.h | 6 ++ x2goclient.pro | 6 +- x2goclient.pro.maemo | 6 +- 11 files changed, 641 insertions(+), 36 deletions(-) create mode 100644 src/pulsemanager.cpp create mode 100644 src/pulsemanager.h -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 44

[vcxsrv] 23/24: Increased version to 1.17.0.0
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.17.0.0 in repository vcxsrv. commit 18a929ea41cc85fddd6e4fee6aa6aa4234ce29f1 Author: marha <marha(a)users.sourceforge.net> Date: Thu Apr 30 23:45:25 2015 +0200 Increased version to 1.17.0.0 --- include/dix-config.h | 2 +- releasenotes/releasenote_1.17.0.0.txt | 1209 +++++++++++++++++++++++++++++ xorg-server/hw/xwin/XWin.rc | 10 +- xorg-server/installer/vcxsrv-64-debug.nsi | 8 +- xorg-server/installer/vcxsrv-64.nsi | 8 +- xorg-server/installer/vcxsrv-debug.nsi | 8 +- xorg-server/installer/vcxsrv.nsi | 8 +- 7 files changed, 1231 insertions(+), 22 deletions(-) diff --git a/include/dix-config.h b/include/dix-config.h index b90354d..6d20e1c 100755 --- a/include/dix-config.h +++ b/include/dix-config.h @@ -372,7 +372,7 @@ #undef XORG_RELEASE /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 10000000) + ((16) * 100000) + ((2) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 10000000) + ((17) * 100000) + ((0) * 1000) + 0) /* Xorg release date */ #define XORG_DATE "10 Sept 2009" diff --git a/releasenotes/releasenote_1.17.0.0.txt b/releasenotes/releasenote_1.17.0.0.txt new file mode 100644 index 0000000..b545822 --- /dev/null +++ b/releasenotes/releasenote_1.17.0.0.txt @@ -0,0 +1,1209 @@ +Changes in 1.17.0.0 +------------------- +- Update the following packages: + git updates until 30/04/2015 of the following packages + mesa + libxcb + libxcb/xcb-proto + fontconfig + libX11 + xserver + xkbcomp + xkeyboard-config + pixman + randrproto + libXdmcp + libXmu + libfontenc + xwininfo + openssl-1.0.2a + freetype 2.5.5 + libXfixes-5.0 + xcalc-1.0.6 + xproto-7.0.27 + +Changes in 1.16.2.0 +------------------- +- Update the following packages: + git updates until 12/11/2014 of the following packages + mesa + libxcb + libxcb/xcb-proto + fontconfig + libX11 + xserver + xkbcomp + xkeyboard-config + pixman + openssl-1.0.1j + +Changes in 1.16.1.0 +------------------- +- Update the following packages: + git updates until 12/10/2014 of the following packages + mesa + libxcb + libxcb/xcb-proto + libX11 + libXext + xkeyboard-config + xserver + fontconfig + mkfontscale + pixman + plink + libxtrans + xkeyboard-config + libXfont 1.5.0 + openssl-1.0.1i + +Changes in 1.15.2.0 +------------------- +- Update the following packages: + git updates until 5/07/2014 of the following packages + mesa + libxcb + xkeyboard-config + xserver + fontconfig + pixman + xwininfo + libX11 + plink + libxcb + xcb-proto + mkfontscale + freetype 2.5.3 + libXfont 1.4.8 + openssl 1.0.1h + +Changes in 1.15.0.2 +------------------- +- Update the following packages: + git updates until 1/05/2014 of the following packages + mesa + libxcb + xkeyboard-config + xserver + libxtrans + fontconfig + xcb-proto + pixman + plink revision 10184 +- Solved problem with notab and noframe styles + +CChanges in 1.15.0.1 +------------------- +- Update the following packages: + git updates until 31/03/2014 of the following packages + mesa + libxtrans + fontconfig + xserver + libXfont-1.4.7 + xproto-7.0.25 + +Changes in 1.15.0 +----------------- +- Update the following packages: + git updates until 25/03/2014 of the following packages + xserver + mesa + libxcb + xcb-proto + xkeyboard-config + randsrproto + fontconfig + libX11 + libXext + xkbcomp + libxtrans +- Solved problem of silent-dup-error not always being checked correctly +- Now taskbar with notab can be specified in system.XWinrc +- Also install a default X0.hosts file + +Changes in 1.14.5 +----------------- +- Update the following packages: + git updates until 22/12/2013 of the following packages + xserver + mesa + pixman + mkfontscale + libxtrans + fontconfig + glproto + libX11 + libxcb + xcbproto + xkeyboard-config + libXinerama + libXmu + +Changes in 1.14.4 +----------------- +- Update the following packages: + git updates until 21/11/2013 of the following packages + xserver + mesa + pixman + fontconfig + libXau + xkeyboard-config + libxcb + libxcb/xcb-proto + libX11 + libXdmcp + libXext + libfontenc + libXinerama + xkbcomp + xextproto + randrproto + glproto + mkfontscale + xwininfo + libXft + libXmu + libxtrans + mkfontscale + libXpm-3.5.11 + libXaw-1.0.12 + libXfont-1.4.6 + libXrender-0.9.8 + xproto-7.0.24 + inputproto-2.3 + xclock-1.0.7 + xhost-1.0.6 + zlib-1.2.8 +- Added expat-2.1.0 +- Added presentproto-1.0 +- Now compiled with Visual Studio 2013 Express Edition +- mesa: Solved freeing of invalid pointer + +Changes in 1.14.3 +----------------- +- Update the following packages: + git updates until 19/09/2013 of the following packages + xserver + mesa + pixman + libXmu + xkeyboard-config + libX11 + xkbcomp + fontconfig + libxcb + libxcb/xcb-proto + libXdmcp + libXext +- Now compiled with Visual Studio 2012 Express Edition + +Changes in 1.14.2.1 +------------------- +- Update the following packages: + git updates until 26/07/2013 of the following packages + xserver + mesa + libxcb + libxcb/xcb-proto + fontconfig + libXext + libX11 + libxtrans + xkbcomp + mkfontscale + libXmu + libxml 2.9.1 +- gen_gl_wrappers: now use the opengl xml specification files as input +- Now also release 64-bit version + +Changes in 1.14.2.0 +------------------- +- Update the following packages: + git updates until 21/06/2013 of the following packages + mesa + xkeyboard-config + xserver + pixman + libX11 + mkfontscale + libXmu + xwininfo + fontconfig + libxcb + libxcb/xcb-proto + libXau + libfontenc + libXext + libXinerama + xkbcomp + libXdmcp + xrdb + freetype-2.5.0.1 +- wgl: do not use transparent windows for the opengl windows +- Solved problem of logverbosity parameter not taking into account + +Changes in 1.13.2.0 +------------------- +- Update the following packages: + git updates until 13/02/2013 of the following packages + mesa + xkeyboard-config + xserver + pixman + fontconfig + libX11 + libXft + libXau + xkbcomp + mkfontscale + libXdmcp + libXmu + xwininfo + libxtrans + libXinerama + libfontenc + libXext + glproto + libxcb + cvs update until 13/02/2013 of pthreads + inputproto 2.2.99.1 + bdftopcf 1.0.4 + xcalc 1.0.5 + openssl-1.0.1e + freetype-2.4.11 + +- xlaunch: solved problem of prompt not being shown in xp +- Use fonts.conf file in fontconfig +- xlaunch: Use dialog for prompting for password input instead of console + +Changes in 1.13.1.0 +------------------- +- Update the following packages: + git updates until 05/12/2012 of the following packages + mesa + xkeyboard-config + xserver + pixman + xkbcomp + libX11 + libXdmcp + libxcb + xkeyboard-config + fontconfig + +- Solved problem of dxtn.dll not loaded anymore +- xlaunch: Allow specifying a key file in putty format when starting a + remote program. When the private key is password protected a + terminal window will pop up where this password can be entered + (except when a password is specified in the xlaunch config file) +- xlaunch: when no password specified, a password can be entered in + the console window that will popup when the plink asks for a password +- Now plink is a real console application in the release build (no -console + option anymore) +- Added buildscript to compile from cygwin terminal +- plink: when writing to stderr, flush immediately so that the error + output is seen immediately instead of at the end of the program + + +Changes in 1.13.0.0 +------------------- +- Update the following packages: + git updates until 22/10/2012 of the following packages + mesa + xkeyboard-config + xserver + pixman + libX11 + xwininfo + fontconfig + libXau + libXext + libxcb + randrproto +- Reverted xorg commit bafbd99080be49a17be97d2cc758fbe623369945 + Gave problems in vcsrv on multiple monitors +- Removed printing milli-seconds in log file +- Changed fatal error message +- Initialize the log file a little bit earlier in the startup process +- Too long env variables: Instead of giving a fatal error just remove + the env variables that are too long +- Solved problem of finding valid open socket in case ipv6 is not installed + and display number -1 is passed. +- Make sure that version info is print to log file + +Changes in 1.12.99.0 +------------------- +- Update the following packages: + git updates until 22/8/2012 of the following packages + fontconfig + mesa + xkeyboard-config + xserver + pixman + libxcb + randrproto + libX11 + libXext + zlib-1.2.7 +- Compiled the following modules as dlls: + zlib + libX11 + libXau + libxcb + libXmu + libXext +- Installer: Make installing debug version optional +- Solved problem of using wrong name for log file when -displayfd is used +- Fixed problem in Win32TempDir of returning NULL in case TEMP env variable + is not defined and TMP is +- winProcessXEventsTimeout: improved accuracy of timeout +- winUpdateWindowPosition: do not assume WS_EX_APPWINDOW style +- multiwindow: do not ignore the windows key. Now the windows key can + be used as the meta key in emacs +- Solved possible crash in winMultiWindowGetClassHint because second + string is not always null terminated + +Changes in 1.12.2.0 +------------------- +- Update the following packages: + git updates until 15/6/2012 of the following packages + fontconfig + mesa + xkeyboard-config + xserver + pixman + libX11 + libXau + libXext + libxcb + libfontenc + glproto + freetype-2.4.10 + libXaw-1.0.11 + openssl-1.0.1c +- xserver: added support for -displayfd option +- xserver: made sure that the maximum number of clients is back at 1024 + +Changes in 1.12.0.1 +------------------- +- Update the following packages: + git updates until 10/4/2012 of the following packages + fontconfig + mesa + xkeyboard-config + xserver + pixman + openssl-1.0.1 + bigreqsproto-1.1.2 + fontsproto-2.1.2 + recordproto-1.14.2 + scrnsaverproto-1.2.2 + xcmiscproto-1.2.2 + libXt-1.1.3 + xhost-1.0.5 + kbproto-1.0.6 + libXrender-0.9.7 + libxkbfile-1.0.8 + freetype-2.4.9 + libXaw-1.0.10 + libXpm-3.5.10 + xproto-7.0.23 + +- Solved problem when specifying -fullscreen on command line because default + resizing behaviour was changed to resize (which is not allowed in + fullscreen) + +Changes in 1.12.0.0 +------------------- +- Update the following packages: + git updates until 30/3/2012 of the following packages + mesa + xserver + libxcb + libX11 + pixman + xkeyboard-config + fontconfig + mkfontscale + xkbcomp + mesa + libXau + libXdmcp + libXext + libXft + libXinerama + libXmu + font-util-1.3.0 + xclock-1.0.6 + libXfont-1.4.5 + inputproto-2.2 + freetype-2.4.9 + +- Remove unused WindowExposuresProcPtr storage in screen privates +- Return error when bitsperpixel is less then 24 +- Added taskbar grouping for windows 7 +- Solved possible crashes when drawable cannot be created. + + +Changes in 1.11.4.0 +------------------- +- Update the following packages: + git updates until 30/1/2012 of the following packages + mesa + xserver + libxcb + libX11 + pixman + xkeyboard-config + xwininfo + mkfontscale + libxtrans + libXdmcp + plink svn update until 30/1/2012 + inputproto-2.1.99.5 + xf86bigfontproto-1.2.0 + openssl-1.0.0g +- Added xhost-1.0.4 application +- Added xauth-1.0.6 application +- Implemented Implemented prgrbs ungrab clsgrb and prwins keyboard actions +- Enable the keyboard options grab:break_actions by default +- Enabled XFree86 BigFont extension +- Solved possible crash in multiwindow mode +- glx: added safety against the use of a null pointer + +Changes in 1.11.3.0 +------------------- +- Update the following packages: + git updates until 17/12/2011 of the following packages + mesa + xserver + libxtrans + libX11 + pixman + libxcb + glproto + xkeyboard-config + +- Added -parentprocessid command line option + +Changes in 1.11.2.0 +------------------- +- Update the following packages: + git updates until 18/11/2011 of the following packages + mesa + xserver + pixman + libxcb + libX11 + libXext + xkeyboard-config + libXmu + libxtrans + libXdmcp + libXau + libXft + libXinerama + libfontenc + xwininfo + libXmu + mkfontscale + fontconfig + freetype 2.4.8 + openssl-1.0.0e + inputproto-2.1.99.1 + +Changes in 1.11.0.0 +------------------- +- Update the following packages: + git updates until 5/9/2011 of the following packages + mesa + xserver + pixman + libxcb + libX11 + libXext + xkeyboard-config + randrproto + xwininfo + libXmu + libXfont-1.4.4 + freetype 2.4.6 +- Installer: installation of fonts is optional now +- xserver: Use AllocDevicePair for create the mouse and keyboard devices +- xserver: Solved problem of window not taking the default window position when + created. + +Changes in 1.10.3.0 +------------------- +- Update the following packages: + git updates until 18/7/2011 of the following packages + mesa + xserver + pixman + libX11 + freetype 2.4.5 + inputproto-2.0.2 + xproto-7.0.22 + resourceproto-1.2.0 + pthreads cvs version until 18/7/2011 + +- Fixed regression in wgl implementation in multi-window mode + +Changes in 1.10.3.0 +------------------- +- Update the following packages: + git updates until 11/7/2011 of the following packages + mesa + xserver + pixman + mkfontscale + xkeyboard-config + libX11 + libXext + libXmu + xkbcomp + libXdmcp + libxtrans + x11proto + fontconfig + xwininfo +- Increased number of clients to 1024 +- Also show the cursor in the main window when the xdmcp host selection dialog is shown + +Changes in 1.10.1.1 +------------------- +- Update the following packages: + glproto git update until 24/5/2011 + libfontenc git update until 24/5/2011 + libxcb git update until 24/5/2011 + pixman git update until 24/5/2011 + xkeyboard-config git update until 24/5/2011 + mesa git update until 24/5/2011 + xserver git update until 24/5/2011 + xcb-proto git update until 24/5/2011 + mkfontscale git update until 24/5/2011 +- xkeyboard-config: Solved problem with Alt Gr key on some keyboards (e.g. belgian) + + +Changes in 1.10.1.0 +------------------- +- Update the following packages: + mesa git update until 5/5/2011 + xserver git update until 5/5/2011 + xkeyboard-config git update until 5/5/2011 + libxcb git update until 5/5/2011 + xkbcomp git update until 5/5/2011 + libXext git update until 5/5/2011 + libXmu git update until 5/5/2011 + libX11 git update until 5/5/2011 + libXdmcp git update until 5/5/2011 + xextproto git update until 5/5/2011 + libxtrans git update until 5/5/2011 + pixman git update until 5/5/2011 + glproto git update until 5/5/2011 + openssl-1.0.0d +- wgl; Solved crash because of pointer usages after memory has been freed. + + +Changes in 1.10.0.1 +------------------- +- Update the following packages: + xserver git update until 29/3/2011 + mesa git update until 29/3/2011 + xkeyboard-config git update until 29/3/2011 + libX11 git update until 29/3/2011 + pixman git update until 29/3/2011 + libxcb git update until 29/3/2011 + fontconfig git update until 29/3/2011 + glproto git update until 29/3/2011 + libXau git update until 29/3/2011 + libXft git update until 29/3/2011 + libXmu git update until 29/3/2011 + libfontenc git update until 29/3/2011 + mkfontscale git update until 29/3/2011 + randrproto git update until 29/3/2011 + xtrans git update until 29/3/2011 + xwininfo git update until 29/3/2011 + xproto-7.0.21 git update until 29/3/2011 + xineramaproto-1.2.1 + libXt-1.1.1 + libxkbfile-1.0.7 + libXpm-3.5.9 + libXfont-1.4.3 + libXaw-1.0.9 + bdftopcf-1.0.3 + encodings-1.0.4 + fixesproto-5.0 + font-adobe-100dpi-1.0.3 + font-adobe-75dpi-1.0.3 + font-adobe-utopia-100dpi-1.0.4 + font-adobe-utopia-75dpi-1.0.4 + font-adobe-utopia-type1-1.0.4 + font-alias-1.0.3 + font-arabic-misc-1.0.3 + font-bh-100dpi-1.0.3 + font-bh-75dpi-1.0.3 + font-bh-lucidatypewriter-100dpi-1.0.3 + font-bh-lucidatypewriter-75dpi-1.0.3 + font-bh-ttf-1.0.3 + font-bh-type1-1.0.3 + font-bitstream-100dpi-1.0.3 + font-bitstream-75dpi-1.0.3 + font-bitstream-speedo-1.0.2 + font-bitstream-type1-1.0.3 + font-cronyx-cyrillic-1.0.3 + font-cursor-misc-1.0.3 + font-daewoo-misc-1.0.3 + font-dec-misc-1.0.3 + font-ibm-type1-1.0.3 + font-isas-misc-1.0.3 + font-jis-misc-1.0.3 + font-micro-misc-1.0.3 + font-misc-cyrillic-1.0.3 + font-misc-ethiopic-1.0.3 + font-misc-meltho-1.0.3 + font-misc-misc-1.1.2 + font-mutt-misc-1.0.3 + font-schumacher-misc-1.1.2 + font-screen-cyrillic-1.0.4 + font-sony-misc-1.0.3 + font-sun-misc-1.0.3 + font-util-1.2.0 + font-winitzki-cyrillic-1.0.3 + font-xfree86-type1-1.0.4 +- Added ipv6 support +- Solved past problem in windows when used with x2goclient (with -clipboard) +- Solved problem of GetKeyState not always returning the correct state in WM_SETFOCUS +- Delay calling winInitializeModeKeyStates until the keyboard device has been started +- Solved possible crash due to NULL pointer access + +Changes in 1.10.0.0 +------------------- +- Update the following packages: + xserver git update until 8/3/2011 + xkeyboard-config git update until 8/3/2011 + pixman git update until 8/3/2011 + libX11 git update until 8/3/2011 + mesa git update until 8/3/2011 + randrproto git update until 8/3/2011 + Xextproto git update until 8/3/2011 + libxcb git update until 8/3/2011 +- Solved errors when used with xmodmap +- xlaunch: + . removed dependency on msxml 4.0 + libxml2 is now used for parsing the xml input file + . added possibility to only map the CLIPBOARD selection to the-RECORD-extension + windows clipboard + . fixed problems when starting a client (local and remote) + . added option to set disable access control + . added option to terminate vcxsrv on server reset (xdmcp) +- xserver: Made winOverrideStyle thread safe +- xserver: Synchronize Xserver glx/rensize.c with mesa src/glx/compsize.c +- native glx: Handle failure to get any fbconfigs more gracefully +- vcxsrv: added -[no]clipboardprimary. Can be used to only map the CLIPBOARD + selection to the windows clipboard + +Changes in 1.9.4.1 +------------------ +- Update the following packages: + xkeyboard-config git update until 16/2/2011 + pixman git update until 16/2/2011 + xkbcomp git update until 16/2/2011 + mesa git update until 16/2/2011 +- Solved problem of wrongly generated error message in vcxsrv_dbg +- Solved problem of a window being created with an Y coordinate of 0x8000000. +- xdmcp: Solved display problem when multiple monitor setup changes +- When XDMCP -from is specified, only register the requested address +- Only call XSupportsLocale in one place. Switch to a known locale when it fails +- Type cast width to short to avoid type cast exception in debug version when width is negative. +- multiwindow; Solved possible crash because the pixmap buffer was not + correct anymore after moving a window + +Changes in 1.9.4.0 +------------------ +- Update the following packages: + xserver git update until 10/2/2011 + libXext + libXau + libX11 + pixman + mesa + libfontenc + libXinerama +- xdmcp: add host connected to in the title of the main window +- Solved a crash in multiwindow mode due to a stack overflow (possible endless recursion) + +Changes in 1.9.3.1 +------------------ +- Update the following packages: + xserver git update until 2/2/2011 + pixman git update until 2/2/2011 + libX11 git update until 2/2/2011 + xkeyboard-config git update until 2/2/2011 + libxcb git update until 2/2/2011 + mesa git update until 2/2/2011 + xkbcomp git update until 2/2/2011 + libfontenc git update until 2/2/2011 + libXau git update until 2/2/2011 + libXinerama git update until 2/2/2011 + libXdmcp git update until 2/2/2011 + plink: updated to putty revision 9080 + freetype 2.4.4 + openssl-1.0.0c + cvs update pthreads +- Added following packages + xbitmaps-1.1.1 + libXft-2.2.0 + fontconfig-2.8.0 + libXrender-0.9.6 + windowswmproto-1.0.4 +- Prevent crash with remote font servers +- Use winUpdateFBPointer() in winshaddd.c rather than duplicating it inline +- VS2008 is not actively supported anymore +- Search for bitmaps in the current directory in stead of the HOME directory on windows +- Search for XtErrorDB in current directory +- added XtErrorDB file +- Added xclock application files +- Do not include dllmain for static library +- Solved possible crash due to not initialised pointer +- Use other default bitmap dir +- Solved problem of app icon not being loaded +- Enabled XRENDER in xclock +- Use .Xdefaults file in current directory +- Also install xclock and xclock-color +- solved problem of -resize not working when window was maximised +- Xlaunch: solved problem of Wgl setting not being saved in configuration file +- Enabled ROOTLESS option in dix +- Solved problem of using an unitialised variable. +- release build: main should also pass the penv argument +- Enabled global optimisation in release build: linker is a lot slower but it should give better performance +- Added host selection menu in case -broadcast is given on the command line + +Changes in 1.9.3.0 +------------------ +- Update the following packages: + xserver git update until 9/1/2011 + pixman git update until 9/1/2011 + libX11 git update until 9/1/2011 + libXext git update until 9/1/2011 + xkeyboard-config git update until 9/1/2011 + libxcb git update until 9/1/2011 + libfontenc update until 9/1/2011 + xextproto git update until 9/1/2011 + libXdmcp git update until 9/1/2011 + randrproto git update until 9/1/2011 + mesa git update until 9/1/2011 + bigreqsproto-1.1.1 + compositeproto-0.4.2 + damageproto-1.2.1 + fixesproto-4.1.2 + fontsproto-2.1.1 + inputproto-2.0.1 + randrproto-1.3.2 + recordproto-1.14.1 + scrnsaverproto-1.2.1 + xcmiscproto-1.2.1 + xproto-7.0.20 + xtrans 1.2.6 + xcalc-1.0.4.1 + +- updated to 9025 of putty +- Added dxtn.dll (compression functions used in mesa) +- mesa: solved opengl problem whan opengl is enabled in java + +Changes in 1.9.2.0 +------------------ +- Update the following packages: + xserver git update until 4/11/2010 + libxcb git update until 4/11/2010 + libfontenc git update until 4/11/2010 + pixman git update until 4/11/2010 + xcb-proto git update until 4/11/2010 + libX11 git update until 4/11/2010 + libXdmcp git update until 4/11/2010 + xkbcomp git update until 4/11/2010 +- Fixed regression in libxcb introduced in 1.9.0.0 +- Give clipboard window a name + +Changes in 1.9.0.902 +-------------------- +- Update the following packages: + xserver git update until 18/10/2010 + xkeyboard-config git update until 18/10/2010 + pixman git update until 18/10/2010 + libX11 git update until 18/10/2010 + libXau git update until 18/10/2010 + libXinerama git update until 18/10/2010 + glproto-1.4.12 + kbproto-1.0.5 + renderproto-0.11.1 + xclock-1.0.5 + xextproto-7.1.2 + xproto-7.0.18 + xwininfo-1.1.0 + font-mutt-misc-1.0.2 + font-sun-misc-1.0.2 +- Cleaned ddraw code and solved problem of screen disappearing when monitor setup changes +- Solved problem when having multiple netword cards +- multiwindow: only make the window visible when it is not inputonly +- Update gl.spec + +Changes in 1.9.0.2 +------------------ +- Update the following packages: + xserver git update until 21/9/2010 + pixman git update until 21/9/2010 + libX11 git update until 21/9/2010 +- Solved a number of problems with native opengl mode (-wgl) +- Native opengl: updated to the latest opengl spec files +- glx: synchronised with version of mesa currently used +- Implemented smart schedule timer +- Solved possible lockup when closing down + +Changes in 1.9.0.1 +------------------ +- Update the following packages: + xserver git update until 11/9/2010 + pixman git update until 11/9/2010 + libX11 git update until 11/9/2010 +- Solved regression swrast_dri.dll not working anymore +- xlaunch: Make sure xdmcp is never selected in multiwindow mode + +Changes in 1.9.0.0 +------------------ +- Update the following packages: + xserver git update until 4/9/2010 + xkeyboard-config + libX11 + pixman + libxcb + xkeyboard-config +- synchronised glx with mesa version +- make sure process exits when clipboard thread or multiwindow thread closes +- added support for some multimedia keys + +Changes in 1.8.99.906 +--------------------- +- Update the following packages: + mesa-7.8.2 + freetype 2.4.2 + libX11 git update until 20/8/2010 + libXdmcp git update until 20/8/2010 + libXext git update until 20/8/2010 + libXau + pixman + libxcb git update until 20/8/2010 + xserver git update until 20/8/2010 + xkeyboard-config git update until 20/8/2010 + libXinerama git update until 20/8/2010 +- Fix a GDI bitmap resource leak of window icons +- Internal WM workaround for Java AWT bug +- Add a keycode mapping for VK_OEM_8 which can be issued by Canadian Multilingual + Standard layout +- Update mapping for Canadian keyboard layouts + 0x00000c0c "Canadian French (legacy)" => layout ca variant fr-legacy + 0x00001009 "Canadian French" => layout ca variant fr + 0x00011009 "Canadian Multilingual Standard" => layout ca variant multix +- Cleanup in rootless code +- xkbcomp: avoid needless recompilation when switching between debug and release +- fixed wrong library name for freetype library + + +Changes in 1.8.99.904 +--------------------- +- Update the following packages: + libXfont-1.4.2 + libX11 git update until 11/7/2010 + libXext git update until 11/7/2010 + libxcb git update until 11/7/2010 + xserver git update until 11/7/2010 + xkeyboard-config git update until 11/7/2010 + libXinerama git update until 11/7/2010 +- Solved possible dead-lock when exiting vcxsrv (when x-selection active) +- Solved possible crash in _XReadEvents function + +Changes in 1.8.99.901 +--------------------- +- Update the following packages: + openssl-1.0.0a + mesa-7.8.1 + xserver git update until 17/6/2010 + libxcb git update until 17/6/2010 + libXext git update until 17/6/2010 + libX11 git update until 17/6/2010 + xkeyboard-config git update until 17/6/2010 + +Changes in 1.8.1 +---------------- +- Update the following packages: + xserver git update until 12/5/2010 (1.8.1) + Updated to xproto-7.0.17 + xkeyboard-config git update until 17/5/2010 + libxcb git update until 17/5/2010 + Made it possible to compile with VS2010 + +Changes in 1.8.0 +---------------- +- Update the following packages: + pixman-0.18.0 + xorg-server-1.8.0 + xkeyboard-config git update till 1/4/2010 + mesa 7.8 + freetype-2.3.12 + openssl 1.0.0 + +Changes in 1.7.99.902 +--------------------- +- Update the following packages: + pixman-0.17.10 + xserver git update till 16/3/2010 + xkeyboard-config git update till 16/3/2010 + mesa 7.7 + libXt-1.0.8 +- Added terminus-font-4.30 +- libwinmain: Make sure that control C only kills the process when a new console is created. +- Solved problem when path environment variable was larger then 1024 bytes +- Solved possible crash of accessing a null pointer +- Enabled XCSECURITY +- Solved 'ceil' undefined warning +- Solved '_XSERVTransWSAStartup' undefined warning +- Solved problem of some windows not being sizeable in multiwindow mode + +Changes in 1.7.99.901 +--------------------- +- Update the following packages: + pixman-0.17.6 + xorg-server-1.7.99.901 + xserver git update till 15/2/2010 +- Solved .xlaunch file extension registry problem in vista +- Added opengl option in xlaunch +- Added showin of log file in menu +- Removed NATIVEGDI compilation (is currently not working) +- Solved problem of certain windows not being sizeable in multiwindow mode +- Also handle MappingNotify event in clipboard thread + + +Changes in 1.7.99.6 +------------------- +- Update the following packages: + libX11-1.3.3 + pixman-0.17.4 + glproto-1.4.11 + xserver git update till 25/1/2010 +- Added patches for bug http://bugs.freedesktop.org/show_bug.cgi?id=20500 + 0001-dix-EventToCore-needs-to-copy-the-root-window-too.patch + 0001-Re-enable-the-RECORD-extension.patch +- Solved a possible crash in closing down the screen due to use on an uninitialised pointer. +- Solved problem in drawing of wide lines. Occured when plotting in octave. + + +Changes in 1.7.99.5 +------------------- +- Update the following packages: + freetype-2.3.11 + mesa_7_6_1_rc1 + xserver git update till 5/1/2010 +- Fixed problem of clipboard client being shutdown when connecting through xdmcp. +- Always use screen 0 to start windows clients. +- Multiwindow: solved problem of window not having the correct size. + + +Changes in 1.7.99.4 +------------------- +- Update the following packages: + libxcb-1.5 + xcb-proto-1.6 + xserver git update till 17/12/2009 +- Use swrast_dri_dbg.dll when running vcxsrv_dbg.exe +- Added native opengl with the -wgl option + + +Changes in 1.7.99.3 +------------------- +- Update the following packages: + pixman-0.17.2 + +- Switch to the git master branch for xserver +- Added cygwin-aiglx branch of git://anongit.freedesktop.org/~jturney/xserver + to have native opengl rendering. Only working with -multiwindow and + when export LIBGL_ALWAYS_INDIRECT +- vcxsrv.exe: When the first parameter is -console, the output is also written + to the console. +- xinerama: solved endless loop problem when moving the cursor from one screen to there + other. +- vcxsrv.exe: Set the current directory always to the directory where vcxsrv.exe is + installed, so the fonts are always found. + +Changes in 1.7.99.2 +------------------- +- Added the following packages: + xwininfo-1.0.5 + xcalc-1.0.2 + xclock-1.0.4 + libXmu-1.0.5 + libXaw-1.0.7 + libXpm-3.5.8 + libXext-1.1.1 + libXt-1.0.7 +- Solved some building problems in the makefiles when building from cmd.exe +- Do not open command window when running release build +- Solved incorrect behaviour of writev in case the first send succeeded and the second returned with an error. +- Solved crash in dix\colormap.c because wrong map was adjusted when the number of visuals was reallocated. + +Changes in 1.7.99.1 +------------------- +- Updated to the following packages + libX11-1.3.2 + xorg-server-1.7.99.1 + xtrans-1.2.5 + font-util-1.1.1 +- Now complete locale directory is build and packaged. +- solved possible problem in xcb: Make sure the winsock library + and pthread library are initialised. +- Solved problem of local fonts not being registered. This caused certain + application not to start (like xcalc) + +Changes in 1.7.0.1 +------------------ +- Updated to the following packages + encodings-1.0.3 + font-adobe-75dpi-1.0.1 + font-adobe-100dpi-1.0.1 + font-adobe-utopia-75dpi-1.0.2 + font-adobe-utopia-100dpi-1.0.2 + font-adobe-utopia-type1-1.0.2 + font-alias-1.0.2 + font-arabic-misc-1.0.1 + font-bh-75dpi-1.0.1 + font-bh-100dpi-1.0.1 + font-bh-lucidatypewriter-75dpi-1.0.1 + font-bh-lucidatypewriter-100dpi-1.0.1 + font-bh-ttf-1.0.1 + font-bh-type1-1.0.1 + font-bitstream-75dpi-1.0.1 + font-bitstream-100dpi-1.0.1 + font-bitstream-speedo-1.0.1 + font-bitstream-type1-1.0.1 + font-cronyx-cyrillic-1.0.1 + font-cursor-misc-1.0.1 + font-daewoo-misc-1.0.1 + font-dec-misc-1.0.1 + font-ibm-type1-1.0.1 + font-isas-misc-1.0.1 + font-jis-misc-1.0.1 + font-micro-misc-1.0.1 + font-misc-cyrillic-1.0.1 + font-misc-ethiopic-1.0.1 + font-misc-meltho-1.0.1 + font-misc-misc-1.1.0 + font-mutt-misc-1.0.1 + font-schumacher-misc-1.1.0 + font-screen-cyrillic-1.0.2 + font-sony-misc-1.0.1 + font-sun-misc-1.0.1 + font-util-1.1.0 + font-winitzki-cyrillic-1.0.1 + font-xfree86-type1-1.0.2 + libXfont-1.4.1 + mkfontscale-1.0.7 +- Added mesa 7.6. Opengl is working now. +- Bug fix in miClipPictureSrc function. + +Changes in 1.7.0 +---------------- +- Updated to the following packages: + fixesproto-4.1.1 + randrproto-1.3.1 + libxkbfile-1.0.6 + xkeyboard-config-1.7 + pixman-0.16.2 + libX11-1.3 + libXinerama-1.1 + xkbcomp-1.1.1 + recordproto-1.14 + xineramaproto-1.2 + inputproto-2.0 + compositeproto-0.4.1 + xorg-server-1.7.0 +- Removed most tracing in release version. Use vcxsrv_dbg when you want a log of tracing. +- Also install xerrordb file. +- Make sure the temporary file gets deleted after keyboard compilation. +- Take for the log file the same verbosity as for the screen. +- Change trace buffer from static to local to avoid problems in multithreaded tracing. +- Print some more information in X error handler. +- Solved run-time downcast errors in debug version. +- Solved error: XSetWindowBorderWidth can only be called if the window class is different from InputOnly +- Make it possible to overrule XSERVER_DTRACE in the makefiles +- Call XSelectInput when a window is mapped and not when it is created. + (There seems to be windows which created and destroyed soon without being + mapped to real windows. This was causing some errors.) + + +Changes in 1.1.2 +---------------- +- Updated to the following packages: + xorg-server-1.6.99.902 + xproto-7.0.16 + libXdmcp-1.0.3 + bdftopcf-1.0.2 +- Solved endless looping when clipboardthread is restarted due to winioerrhandler. + Caused an unexpected exit of the server when the -clipboard option was specified. +- Solved possible crash upon server restart because some global pointers + were not initialised back to 0 + +Changes in 1.1.1 +---------------- +- Updated to the following packages: + xorg-server-1.6.99.901 + xkeyboard-config-1.6.99 +- Enabled support for xinerama +- Rewritten part of the clipboard code (sometimes clipboard was + not working as expected) + One problem remains (clipboard thread exiting at startup.). This + one is hard to solve since no known recipy to reproduce. +- Now also install the debug version of the executable (vcxsrv_dbg). + This version has some more logging and error checking. +- Solved stack corruption in QueryMonitor. Now use multimon.h +- Bug solved in xcb_conn.c: use closesocket instead of close. +- Also display the number of active clients in the tray icon tooltip text. + +Changes in 1.1.0 +---------------- +- Updated to the following packages: + libX11-1.2.99.901.tar.gz + xtrans-1.2.4.tar.gz + fontsproto-2.1.0.tar.gz + damageproto-1.2.0.tar.gz + xcmiscproto-1.2.0.tar.gz + bigreqsproto-1.1.0.tar.gz + scrnsaverproto-1.2.0.tar.gz + resourceproto-1.1.0.tar.gz + xextproto-7.1.1.tar.gz + recordproto-1.13.99.1.tar.gz + inputproto-1.9.99.902.tar.gz + font-util-1.0.2.tar.gz + xorg-server-1.6.99.900.tar.gz +- Make sure clipboard thread is cleaned up correctly on error. + Solved clipboard thread exits causing the clipboard not to be working. +- Solved some errors in the fonts directory due to makefile problems + +Changes in 1.0.2 +---------------- + +- installer: Do not show details by default +- xlaunch: show message box when display number is nto filled in. +- BUG: Solved right mouse button not working in multi window mode. +- Added plink tool in installation. +- Xlaunch is now a windows application in stead of a console application + +Changes in 1.0.1 +---------------- + +- installer: make sure the latest version of the installed MSVC run-time is used. +- BUG: Solved mouse wheel not behaving correctly (especially when there are multiple monitors) +- locale: swith to the version of libX11/nls/C/makefile +- clipboard: solved paste problem from X to windows (in Vista) +- xkbcomp/listing.c: Solved uninitialised variable error in WIN32 +- xkbdata.src/symbols/level3: Removed warning when compiling for be keyboard. diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc index 4ff7950..c63ec1b 100644 --- a/xorg-server/hw/xwin/XWin.rc +++ b/xorg-server/hw/xwin/XWin.rc @@ -33,11 +33,11 @@ #include "winresource.h" #include "xwin-config.h" -#define VER_FILEVERSION 1,16,2,0 -#define VER_FILEVERSION_STR "1.16.2.0" +#define VER_FILEVERSION 1,17,0,0 +#define VER_FILEVERSION_STR "1.17.0.0" -#define VER_PRODUCTVERSION 1,16,2,0 -#define VER_PRODUCTVERSION_STR "1.16.2.0" +#define VER_PRODUCTVERSION 1,17,0,0 +#define VER_PRODUCTVERSION_STR "1.17.0.0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION @@ -84,7 +84,7 @@ BEGIN LTEXT "VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8 LTEXT "http://vcxsrv.sourceforge.net", IDC_STATIC, 36, 18, 220, 8 LTEXT "marha(a)users.sourceforge.net", IDC_STATIC, 36, 28, 220, 8 - LTEXT "Version "VER_PRODUCTVERSION_STR" (30 Nov 2014)", IDC_STATIC, 36, 38, 220, 8 + LTEXT "Version "VER_PRODUCTVERSION_STR" (30 Apr 2015)", IDC_STATIC, 36, 38, 220, 8 DEFPUSHBUTTON "OK", IDOK, 105, 75, 50, 15 END diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi index b036374..69c943c 100644 --- a/xorg-server/installer/vcxsrv-64-debug.nsi +++ b/xorg-server/installer/vcxsrv-64-debug.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-64-debug.1.16.2.0.installer.exe" +OutFile "vcxsrv-64-debug.1.17.0.0.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES64\VcXsrv @@ -32,11 +32,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.16.2.0" +VIProductVersion "1.17.0.0" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.16.2.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.16.2.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" ; Request application privileges for Windows Vista RequestExecutionLevel admin diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi index ad126e2..9f109d6 100644 --- a/xorg-server/installer/vcxsrv-64.nsi +++ b/xorg-server/installer/vcxsrv-64.nsi @@ -22,7 +22,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-64.1.16.2.0.installer.exe" +OutFile "vcxsrv-64.1.17.0.0.installer.exe" ; The default installation directory InstallDir $programfiles64\VcXsrv @@ -33,11 +33,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir_64" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.16.2.0" +VIProductVersion "1.17.0.0" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.16.2.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.16.2.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" ; Request application privileges for Windows Vista RequestExecutionLevel admin diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index c290af7..58fd970 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -21,7 +21,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv-debug.1.16.2.0.installer.exe" +OutFile "vcxsrv-debug.1.17.0.0.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv @@ -32,11 +32,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.16.2.0" +VIProductVersion "1.17.0.0" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.16.2.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.16.2.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" ; Request application privileges for Windows Vista RequestExecutionLevel admin diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index e01c157..f988b43 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -22,7 +22,7 @@ Name "VcXsrv" ; The file to write -OutFile "vcxsrv.1.16.2.0.installer.exe" +OutFile "vcxsrv.1.17.0.0.installer.exe" ; The default installation directory InstallDir $PROGRAMFILES32\VcXsrv @@ -33,11 +33,11 @@ InstallDirRegKey HKLM SOFTWARE\VcXsrv "Install_Dir" LoadLanguageFile "${NSISDIR}\Contrib\Language files\English.nlf" -VIProductVersion "1.16.2.0" +VIProductVersion "1.17.0.0" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "VcXsrv" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "VcXsrv windows xserver" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.16.2.0" -VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.16.2.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.17.0.0" +VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "1.17.0.0" ; Request application privileges for Windows Vista RequestExecutionLevel admin -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 24/24: Updated mesa 32-bit project options
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.17.0.0 in repository vcxsrv. commit 2e00f3764228cfc91180bbe9375a8d85e0e65a5b Author: marha <marha(a)users.sourceforge.net> Date: Sun May 3 23:02:38 2015 +0200 Updated mesa 32-bit project options --- .../glsl_apps_compile/glsl_apps_compile.vcxproj | 8 ++++---- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 8 ++++---- .../windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index c4533b5..b0c4d73 100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@ -84,7 +84,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> @@ -92,7 +92,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src;..\..\..\..\src\gallium\auxiliary;..\..\..\..\src\gallium\include</AdditionalIncludeDirectories> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -125,13 +125,13 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <PrecompiledHeader> </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src;..\..\..\..\src\gallium\auxiliary;..\..\..\..\src\gallium\include</AdditionalIncludeDirectories> </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index aea4157..8147b46 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -89,8 +89,8 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <FunctionLevelLinking>true</FunctionLevelLinking> @@ -141,8 +141,8 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <BrowseInformation>true</BrowseInformation> diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj index 8447411..b1e3e57 100644 --- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj +++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj @@ -92,8 +92,8 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;../../../../src/gallium/auxiliary;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <BrowseInformation>true</BrowseInformation> @@ -165,8 +165,8 @@ <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <OmitFramePointers>true</OmitFramePointers> <WholeProgramOptimization>true</WholeProgramOptimization> - <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../src/mesa/drivers/dri/common;../../../../../expat/lib;../../../../..;../../../../src;../../../../src/gallium/auxiliary;../../../../src/gallium/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_DLL;SWRAST_DRI_EXPORTS;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;__NOT_HAVE_DRM_H;XML_STATIC;COMPILED_FROM_DSP;%(PreprocessorDefinitions);_USE_MATH_DEFINES</PreprocessorDefinitions> <StringPooling>true</StringPooling> <ExceptionHandling> </ExceptionHandling> -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 22/24: Merge remote-tracking branch 'origin/released'
by git-admin＠x2go.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.17.0.0 in repository vcxsrv. commit 055e5645a789d2822d3c4e5a3bc81ff6a969ff31 Merge: 0f7871f a71d524 Author: marha <marha(a)users.sourceforge.net> Date: Thu Apr 30 23:26:47 2015 +0200 Merge remote-tracking branch 'origin/released' fontconfig/conf.d/10-scale-bitmap-fonts.conf | 32 +- fontconfig/doc/fontconfig-user.sgml | 2 +- fontconfig/src/fcfreetype.c | 84 +---- gl/internal/dri_interface.h | 60 +++ libX11/nls/locale.alias.pre | 6 +- mesalib/Android.common.mk | 18 +- mesalib/Android.mk | 10 +- mesalib/CleanSpec.mk | 8 + mesalib/docs/GL3.txt | 6 +- mesalib/docs/VERSIONS | 4 +- mesalib/docs/index.html | 8 +- mesalib/docs/libGL.txt | 2 +- mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/10.0.3.html | 2 +- mesalib/docs/relnotes/10.5.4.html | 125 +++++++ mesalib/docs/relnotes/10.6.0.html | 12 +- mesalib/docs/relnotes/7.10.html | 2 +- mesalib/docs/versions.html | 4 +- mesalib/docs/viewperf.html | 7 + mesalib/include/GL/internal/dri_interface.h | 60 +++ mesalib/scons/llvm.py | 33 +- mesalib/src/gallium/SConscript | 5 + mesalib/src/gallium/auxiliary/Android.mk | 5 +- mesalib/src/gallium/auxiliary/hud/hud_context.c | 163 +++++++- mesalib/src/gallium/auxiliary/hud/hud_private.h | 4 + mesalib/src/gallium/auxiliary/util/u_tile.c | 4 +- mesalib/src/gallium/auxiliary/util/u_video.h | 36 ++ mesalib/src/glsl/Android.gen.mk | 66 +++- mesalib/src/glsl/Android.mk | 13 +- mesalib/src/glsl/ast_function.cpp | 2 +- mesalib/src/glsl/ast_to_hir.cpp | 4 +- mesalib/src/glsl/glcpp/glcpp-parse.y | 2 +- mesalib/src/glsl/glsl_types.cpp | 23 +- mesalib/src/glsl/glsl_types.h | 7 +- mesalib/src/glsl/link_uniforms.cpp | 2 +- mesalib/src/glsl/linker.cpp | 3 +- mesalib/src/glsl/lower_packed_varyings.cpp | 8 +- mesalib/src/glsl/lower_packing_builtins.cpp | 8 +- mesalib/src/glsl/nir/nir.c | 112 ++++-- mesalib/src/glsl/nir/nir.h | 17 +- mesalib/src/glsl/nir/nir_array.h | 96 +++++ mesalib/src/glsl/nir/nir_from_ssa.c | 2 +- mesalib/src/glsl/nir/nir_lower_locals_to_regs.c | 148 ++++++-- mesalib/src/glsl/nir/nir_lower_to_source_mods.c | 7 + mesalib/src/glsl/nir/nir_lower_var_copies.c | 24 +- mesalib/src/glsl/nir/nir_lower_vars_to_ssa.c | 120 ++---- mesalib/src/glsl/nir/nir_opt_algebraic.py | 1 + mesalib/src/glsl/nir/nir_print.c | 2 + mesalib/src/glsl/nir/nir_types.cpp | 2 +- mesalib/src/glsl/opt_algebraic.cpp | 20 + mesalib/src/glsl/opt_dead_builtin_varyings.cpp | 8 +- mesalib/src/glsl/opt_function_inlining.cpp | 2 +- mesalib/src/glsl/standalone_scaffolding.cpp | 3 - mesalib/src/loader/Android.mk | 2 +- mesalib/src/loader/loader.h | 2 +- mesalib/src/mapi/Android.mk | 2 +- mesalib/src/mapi/glapi/gen/glX_proto_send.py | 2 +- mesalib/src/mapi/glapi/gen/glX_proto_size.py | 2 +- mesalib/src/mapi/glapi/gen/gl_x86-64_asm.py | 2 +- mesalib/src/mapi/glapi/glapi_entrypoint.c | 2 + mesalib/src/mesa/Android.gen.mk | 23 +- mesalib/src/mesa/Android.libmesa_dricore.mk | 15 +- mesalib/src/mesa/Android.libmesa_glsl_utils.mk | 10 +- mesalib/src/mesa/Android.libmesa_st_mesa.mk | 9 +- mesalib/src/mesa/Android.mesa_gen_matypes.mk | 1 - mesalib/src/mesa/drivers/common/meta.c | 1 - mesalib/src/mesa/drivers/dri/Android.mk | 11 +- mesalib/src/mesa/drivers/dri/common/Android.mk | 38 +- mesalib/src/mesa/drivers/dri/common/drirc | 4 + mesalib/src/mesa/main/compiler.h | 5 - mesalib/src/mesa/main/context.c | 6 +- mesalib/src/mesa/main/extensions.c | 2 + mesalib/src/mesa/main/fbobject.c | 9 +- mesalib/src/mesa/main/ffvertex_prog.c | 2 +- mesalib/src/mesa/main/formats.c | 2 +- mesalib/src/mesa/main/macros.h | 5 +- mesalib/src/mesa/main/mtypes.h | 13 - mesalib/src/mesa/main/shader_query.cpp | 56 +-- mesalib/src/mesa/main/shaderapi.c | 9 - mesalib/src/mesa/main/texgetimage.c | 54 ++- mesalib/src/mesa/main/teximage.c | 7 +- mesalib/src/mesa/main/texobj.c | 1 - mesalib/src/mesa/main/texturebarrier.c | 6 + mesalib/src/mesa/main/uniform_query.cpp | 20 +- mesalib/src/mesa/main/version.c | 63 +++- mesalib/src/mesa/math/m_matrix.c | 2 +- mesalib/src/mesa/program/Android.mk | 14 +- mesalib/src/mesa/program/hash_table.h | 4 +- mesalib/src/mesa/program/prog_cache.c | 2 +- mesalib/src/mesa/program/prog_to_nir.c | 25 +- mesalib/src/mesa/state_tracker/st_atom_texture.c | 14 +- mesalib/src/mesa/state_tracker/st_cb_flush.c | 2 +- mesalib/src/mesa/state_tracker/st_cb_texture.c | 2 +- mesalib/src/mesa/state_tracker/st_extensions.c | 9 +- mesalib/src/mesa/state_tracker/st_format.c | 19 +- mesalib/src/mesa/swrast/s_texcombine.c | 2 +- mesalib/src/mesa/tnl/t_vertex.h | 2 +- mesalib/src/mesa/vbo/vbo_exec_api.c | 2 +- mesalib/src/mesa/vbo/vbo_save_draw.c | 2 +- mesalib/src/util/Android.mk | 42 +-- mesalib/src/util/macros.h | 2 + pixman/.gitignore | 1 + pixman/test/Makefile.sources | 1 + pixman/test/affine-bench.c | 436 ++++++++++++++++++++++ xorg-server/glx/util/macros.h | 2 + 105 files changed, 1845 insertions(+), 531 deletions(-) diff --cc gl/internal/dri_interface.h index cd4c7d1,0000000..e139f01 mode 100644,000000..100644 --- a/gl/internal/dri_interface.h +++ b/gl/internal/dri_interface.h @@@ -1,1471 -1,0 +1,1531 @@@ +/* + * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. + * Copyright 2007-2008 Red Hat, Inc. + * (C) Copyright IBM Corporation 2004 + * 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 + * on 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 + * THE COPYRIGHT HOLDERS AND/OR THEIR 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. + */ + +/** + * \file dri_interface.h + * + * This file contains all the types and functions that define the interface + * between a DRI driver and driver loader. Currently, the most common driver + * loader is the XFree86 libGL.so. However, other loaders do exist, and in + * the future the server-side libglx.a will also be a loader. + * + * \author Kevin E. Martin <kevin(a)precisioninsight.com> + * \author Ian Romanick <idr(a)us.ibm.com> + * \author Kristian Høgsberg <krh(a)redhat.com> + */ + +#ifndef DRI_INTERFACE_H +#define DRI_INTERFACE_H + +/* For archs with no drm.h */ +#if defined(__APPLE__) || defined(__CYGWIN__) || defined(__GNU__) || defined(_MSC_VER) +#ifndef __NOT_HAVE_DRM_H +#define __NOT_HAVE_DRM_H +#endif +#endif + +#ifndef __NOT_HAVE_DRM_H +#include <drm.h> +#else +typedef unsigned int drm_context_t; +typedef unsigned int drm_drawable_t; +typedef struct drm_clip_rect drm_clip_rect_t; +#endif + +#include <stdint.h> + +/** + * \name DRI interface structures + * + * The following structures define the interface between the GLX client + * side library and the DRI (direct rendering infrastructure). + */ +/*@{*/ +typedef struct __DRIdisplayRec __DRIdisplay; +typedef struct __DRIscreenRec __DRIscreen; +typedef struct __DRIcontextRec __DRIcontext; +typedef struct __DRIdrawableRec __DRIdrawable; +typedef struct __DRIconfigRec __DRIconfig; +typedef struct __DRIframebufferRec __DRIframebuffer; +typedef struct __DRIversionRec __DRIversion; + +typedef struct __DRIcoreExtensionRec __DRIcoreExtension; +typedef struct __DRIextensionRec __DRIextension; +typedef struct __DRIcopySubBufferExtensionRec __DRIcopySubBufferExtension; +typedef struct __DRIswapControlExtensionRec __DRIswapControlExtension; +typedef struct __DRIframeTrackingExtensionRec __DRIframeTrackingExtension; +typedef struct __DRImediaStreamCounterExtensionRec __DRImediaStreamCounterExtension; +typedef struct __DRItexOffsetExtensionRec __DRItexOffsetExtension; +typedef struct __DRItexBufferExtensionRec __DRItexBufferExtension; +typedef struct __DRIlegacyExtensionRec __DRIlegacyExtension; +typedef struct __DRIswrastExtensionRec __DRIswrastExtension; +typedef struct __DRIbufferRec __DRIbuffer; +typedef struct __DRIdri2ExtensionRec __DRIdri2Extension; +typedef struct __DRIdri2LoaderExtensionRec __DRIdri2LoaderExtension; +typedef struct __DRI2flushExtensionRec __DRI2flushExtension; +typedef struct __DRI2throttleExtensionRec __DRI2throttleExtension; ++typedef struct __DRI2fenceExtensionRec __DRI2fenceExtension; + + +typedef struct __DRIimageLoaderExtensionRec __DRIimageLoaderExtension; +typedef struct __DRIimageDriverExtensionRec __DRIimageDriverExtension; + +/*@}*/ + + +/** + * Extension struct. Drivers 'inherit' from this struct by embedding + * it as the first element in the extension struct. + * + * We never break API in for a DRI extension. If we need to change + * the way things work in a non-backwards compatible manner, we + * introduce a new extension. During a transition period, we can + * leave both the old and the new extension in the driver, which + * allows us to move to the new interface without having to update the + * loader(s) in lock step. + * + * However, we can add entry points to an extension over time as long + * as we don't break the old ones. As we add entry points to an + * extension, we increase the version number. The corresponding + * #define can be used to guard code that accesses the new entry + * points at compile time and the version field in the extension + * struct can be used at run-time to determine how to use the + * extension. + */ +struct __DRIextensionRec { + const char *name; + int version; +}; + +/** + * The first set of extension are the screen extensions, returned by + * __DRIcore::getExtensions(). This entry point will return a list of + * extensions and the loader can use the ones it knows about by + * casting them to more specific extensions and advertising any GLX + * extensions the DRI extensions enables. + */ + +/** + * Used by drivers to indicate support for setting the read drawable. + */ +#define __DRI_READ_DRAWABLE "DRI_ReadDrawable" +#define __DRI_READ_DRAWABLE_VERSION 1 + +/** + * Used by drivers that implement the GLX_MESA_copy_sub_buffer extension. + */ +#define __DRI_COPY_SUB_BUFFER "DRI_CopySubBuffer" +#define __DRI_COPY_SUB_BUFFER_VERSION 1 +struct __DRIcopySubBufferExtensionRec { + __DRIextension base; + void (*copySubBuffer)(__DRIdrawable *drawable, int x, int y, int w, int h); +}; + +/** + * Used by drivers that implement the GLX_SGI_swap_control or + * GLX_MESA_swap_control extension. + */ +#define __DRI_SWAP_CONTROL "DRI_SwapControl" +#define __DRI_SWAP_CONTROL_VERSION 1 +struct __DRIswapControlExtensionRec { + __DRIextension base; + void (*setSwapInterval)(__DRIdrawable *drawable, unsigned int inteval); + unsigned int (*getSwapInterval)(__DRIdrawable *drawable); +}; + +/** + * Used by drivers that implement the GLX_MESA_swap_frame_usage extension. + */ +#define __DRI_FRAME_TRACKING "DRI_FrameTracking" +#define __DRI_FRAME_TRACKING_VERSION 1 +struct __DRIframeTrackingExtensionRec { + __DRIextension base; + + /** + * Enable or disable frame usage tracking. + * + * \since Internal API version 20030317. + */ + int (*frameTracking)(__DRIdrawable *drawable, GLboolean enable); + + /** + * Retrieve frame usage information. + * + * \since Internal API version 20030317. + */ + int (*queryFrameTracking)(__DRIdrawable *drawable, + int64_t * sbc, int64_t * missedFrames, + float * lastMissedUsage, float * usage); +}; + + +/** + * Used by drivers that implement the GLX_SGI_video_sync extension. + */ +#define __DRI_MEDIA_STREAM_COUNTER "DRI_MediaStreamCounter" +#define __DRI_MEDIA_STREAM_COUNTER_VERSION 1 +struct __DRImediaStreamCounterExtensionRec { + __DRIextension base; + + /** + * Wait for the MSC to equal target_msc, or, if that has already passed, + * the next time (MSC % divisor) is equal to remainder. If divisor is + * zero, the function will return as soon as MSC is greater than or equal + * to target_msc. + */ + int (*waitForMSC)(__DRIdrawable *drawable, + int64_t target_msc, int64_t divisor, int64_t remainder, + int64_t * msc, int64_t * sbc); + + /** + * Get the number of vertical refreshes since some point in time before + * this function was first called (i.e., system start up). + */ + int (*getDrawableMSC)(__DRIscreen *screen, __DRIdrawable *drawable, + int64_t *msc); +}; + + +#define __DRI_TEX_OFFSET "DRI_TexOffset" +#define __DRI_TEX_OFFSET_VERSION 1 +struct __DRItexOffsetExtensionRec { + __DRIextension base; + + /** + * Method to override base texture image with a driver specific 'offset'. + * The depth passed in allows e.g. to ignore the alpha channel of texture + * images where the non-alpha components don't occupy a whole texel. + * + * For GLX_EXT_texture_from_pixmap with AIGLX. + */ + void (*setTexOffset)(__DRIcontext *pDRICtx, GLint texname, + unsigned long long offset, GLint depth, GLuint pitch); +}; + + +/* Valid values for format in the setTexBuffer2 function below. These + * values match the GLX tokens for compatibility reasons, but we + * define them here since the DRI interface can't depend on GLX. */ +#define __DRI_TEXTURE_FORMAT_NONE 0x20D8 +#define __DRI_TEXTURE_FORMAT_RGB 0x20D9 +#define __DRI_TEXTURE_FORMAT_RGBA 0x20DA + +#define __DRI_TEX_BUFFER "DRI_TexBuffer" +#define __DRI_TEX_BUFFER_VERSION 3 +struct __DRItexBufferExtensionRec { + __DRIextension base; + + /** + * Method to override base texture image with the contents of a + * __DRIdrawable. + * + * For GLX_EXT_texture_from_pixmap with AIGLX. Deprecated in favor of + * setTexBuffer2 in version 2 of this interface + */ + void (*setTexBuffer)(__DRIcontext *pDRICtx, + GLint target, + __DRIdrawable *pDraw); + + /** + * Method to override base texture image with the contents of a + * __DRIdrawable, including the required texture format attribute. + * + * For GLX_EXT_texture_from_pixmap with AIGLX. + * + * \since 2 + */ + void (*setTexBuffer2)(__DRIcontext *pDRICtx, + GLint target, + GLint format, + __DRIdrawable *pDraw); + /** + * Method to release texture buffer in case some special platform + * need this. + * + * For GLX_EXT_texture_from_pixmap with AIGLX. + * + * \since 3 + */ + void (*releaseTexBuffer)(__DRIcontext *pDRICtx, + GLint target, + __DRIdrawable *pDraw); +}; + +/** + * Used by drivers that implement DRI2 + */ +#define __DRI2_FLUSH "DRI2_Flush" +#define __DRI2_FLUSH_VERSION 4 + +#define __DRI2_FLUSH_DRAWABLE (1 << 0) /* the drawable should be flushed. */ +#define __DRI2_FLUSH_CONTEXT (1 << 1) /* glFlush should be called */ +#define __DRI2_FLUSH_INVALIDATE_ANCILLARY (1 << 2) + +enum __DRI2throttleReason { + __DRI2_THROTTLE_SWAPBUFFER, + __DRI2_THROTTLE_COPYSUBBUFFER, + __DRI2_THROTTLE_FLUSHFRONT +}; + +struct __DRI2flushExtensionRec { + __DRIextension base; + void (*flush)(__DRIdrawable *drawable); + + /** + * Ask the driver to call getBuffers/getBuffersWithFormat before + * it starts rendering again. + * + * \param drawable the drawable to invalidate + * + * \since 3 + */ + void (*invalidate)(__DRIdrawable *drawable); + + /** + * This function reduces the number of flushes in the driver by combining + * several operations into one call. + * + * It can: + * - throttle + * - flush a drawable + * - flush a context + * + * \param context the context + * \param drawable the drawable to flush + * \param flags a combination of _DRI2_FLUSH_xxx flags + * \param throttle_reason the reason for throttling, 0 = no throttling + * + * \since 4 + */ + void (*flush_with_flags)(__DRIcontext *ctx, + __DRIdrawable *drawable, + unsigned flags, + enum __DRI2throttleReason throttle_reason); +}; + + +/** + * Extension that the driver uses to request + * throttle callbacks. + */ + +#define __DRI2_THROTTLE "DRI2_Throttle" +#define __DRI2_THROTTLE_VERSION 1 + +struct __DRI2throttleExtensionRec { + __DRIextension base; + void (*throttle)(__DRIcontext *ctx, + __DRIdrawable *drawable, + enum __DRI2throttleReason reason); +}; + ++ ++/** ++ * Extension for fences / synchronization objects. ++ */ ++ ++#define __DRI2_FENCE "DRI2_Fence" ++#define __DRI2_FENCE_VERSION 1 ++ ++#define __DRI2_FENCE_TIMEOUT_INFINITE 0xffffffffffffffffllu ++ ++#define __DRI2_FENCE_FLAG_FLUSH_COMMANDS (1 << 0) ++ ++struct __DRI2fenceExtensionRec { ++ __DRIextension base; ++ ++ /** ++ * Create and insert a fence into the command stream of the context. ++ */ ++ void *(*create_fence)(__DRIcontext *ctx); ++ ++ /** ++ * Get a fence associated with the OpenCL event object. ++ * This can be NULL, meaning that OpenCL interoperability is not supported. ++ */ ++ void *(*get_fence_from_cl_event)(__DRIscreen *screen, intptr_t cl_event); ++ ++ /** ++ * Destroy a fence. ++ */ ++ void (*destroy_fence)(__DRIscreen *screen, void *fence); ++ ++ /** ++ * This function waits and doesn't return until the fence is signalled ++ * or the timeout expires. It returns true if the fence has been signaled. ++ * ++ * \param ctx the context where commands are flushed ++ * \param fence the fence ++ * \param flags a combination of __DRI2_FENCE_FLAG_xxx flags ++ * \param timeout the timeout in ns or __DRI2_FENCE_TIMEOUT_INFINITE ++ */ ++ GLboolean (*client_wait_sync)(__DRIcontext *ctx, void *fence, ++ unsigned flags, uint64_t timeout); ++ ++ /** ++ * This function enqueues a wait command into the command stream of ++ * the context and then returns. When the execution reaches the wait ++ * command, no further execution will be done in the context until ++ * the fence is signaled. This is a no-op if the device doesn't support ++ * parallel execution of contexts. ++ * ++ * \param ctx the context where the waiting is done ++ * \param fence the fence ++ * \param flags a combination of __DRI2_FENCE_FLAG_xxx flags that make ++ * sense with this function (right now there are none) ++ */ ++ void (*server_wait_sync)(__DRIcontext *ctx, void *fence, unsigned flags); ++}; ++ ++ +/*@}*/ + +/** + * The following extensions describe loader features that the DRI + * driver can make use of. Some of these are mandatory, such as the + * getDrawableInfo extension for DRI and the DRI Loader extensions for + * DRI2, while others are optional, and if present allow the driver to + * expose certain features. The loader pass in a NULL terminated + * array of these extensions to the driver in the createNewScreen + * constructor. + */ + +typedef struct __DRIgetDrawableInfoExtensionRec __DRIgetDrawableInfoExtension; +typedef struct __DRIsystemTimeExtensionRec __DRIsystemTimeExtension; +typedef struct __DRIdamageExtensionRec __DRIdamageExtension; +typedef struct __DRIloaderExtensionRec __DRIloaderExtension; +typedef struct __DRIswrastLoaderExtensionRec __DRIswrastLoaderExtension; + + +/** + * Callback to getDrawableInfo protocol + */ +#define __DRI_GET_DRAWABLE_INFO "DRI_GetDrawableInfo" +#define __DRI_GET_DRAWABLE_INFO_VERSION 1 +struct __DRIgetDrawableInfoExtensionRec { + __DRIextension base; + + /** + * This function is used to get information about the position, size, and + * clip rects of a drawable. + */ + GLboolean (* getDrawableInfo) ( __DRIdrawable *drawable, + unsigned int * index, unsigned int * stamp, + int * x, int * y, int * width, int * height, + int * numClipRects, drm_clip_rect_t ** pClipRects, + int * backX, int * backY, + int * numBackClipRects, drm_clip_rect_t ** pBackClipRects, + void *loaderPrivate); +}; + +typedef int int32_t; + +/** + * Callback to get system time for media stream counter extensions. + */ +#define __DRI_SYSTEM_TIME "DRI_SystemTime" +#define __DRI_SYSTEM_TIME_VERSION 1 +struct __DRIsystemTimeExtensionRec { + __DRIextension base; + + /** + * Get the 64-bit unadjusted system time (UST). + */ + int (*getUST)(int64_t * ust); + + /** + * Get the media stream counter (MSC) rate. + * + * Matching the definition in GLX_OML_sync_control, this function returns + * the rate of the "media stream counter". In practical terms, this is + * the frame refresh rate of the display. + */ + GLboolean (*getMSCRate)(__DRIdrawable *draw, + int32_t * numerator, int32_t * denominator, + void *loaderPrivate); +}; + +/** + * Damage reporting + */ +#define __DRI_DAMAGE "DRI_Damage" +#define __DRI_DAMAGE_VERSION 1 +struct __DRIdamageExtensionRec { + __DRIextension base; + + /** + * Reports areas of the given drawable which have been modified by the + * driver. + * + * \param drawable which the drawing was done to. + * \param rects rectangles affected, with the drawable origin as the + * origin. + * \param x X offset of the drawable within the screen (used in the + * front_buffer case) + * \param y Y offset of the drawable within the screen. + * \param front_buffer boolean flag for whether the drawing to the + * drawable was actually done directly to the front buffer (instead + * of backing storage, for example) + * \param loaderPrivate the data passed in at createNewDrawable time + */ + void (*reportDamage)(__DRIdrawable *draw, + int x, int y, + drm_clip_rect_t *rects, int num_rects, + GLboolean front_buffer, + void *loaderPrivate); +}; + +#define __DRI_SWRAST_IMAGE_OP_DRAW 1 +#define __DRI_SWRAST_IMAGE_OP_CLEAR 2 +#define __DRI_SWRAST_IMAGE_OP_SWAP 3 + +/** + * SWRast Loader extension. + */ +#define __DRI_SWRAST_LOADER "DRI_SWRastLoader" +#define __DRI_SWRAST_LOADER_VERSION 2 +struct __DRIswrastLoaderExtensionRec { + __DRIextension base; + + /* + * Drawable position and size + */ + void (*getDrawableInfo)(__DRIdrawable *drawable, + int *x, int *y, int *width, int *height, + void *loaderPrivate); + + /** + * Put image to drawable + */ + void (*putImage)(__DRIdrawable *drawable, int op, + int x, int y, int width, int height, + char *data, void *loaderPrivate); + + /** + * Get image from readable + */ + void (*getImage)(__DRIdrawable *readable, + int x, int y, int width, int height, + char *data, void *loaderPrivate); + + /** + * Put image to drawable + * + * \since 2 + */ + void (*putImage2)(__DRIdrawable *drawable, int op, + int x, int y, int width, int height, int stride, + char *data, void *loaderPrivate); +}; + +/** + * Invalidate loader extension. The presence of this extension + * indicates to the DRI driver that the loader will call invalidate in + * the __DRI2_FLUSH extension, whenever the needs to query for new + * buffers. This means that the DRI driver can drop the polling in + * glViewport(). + * + * The extension doesn't provide any functionality, it's only use to + * indicate to the driver that it can use the new semantics. A DRI + * driver can use this to switch between the different semantics or + * just refuse to initialize if this extension isn't present. + */ +#define __DRI_USE_INVALIDATE "DRI_UseInvalidate" +#define __DRI_USE_INVALIDATE_VERSION 1 + +typedef struct __DRIuseInvalidateExtensionRec __DRIuseInvalidateExtension; +struct __DRIuseInvalidateExtensionRec { + __DRIextension base; +}; + +/** + * The remaining extensions describe driver extensions, immediately + * available interfaces provided by the driver. To start using the + * driver, dlsym() for the __DRI_DRIVER_EXTENSIONS symbol and look for + * the extension you need in the array. + */ +#define __DRI_DRIVER_EXTENSIONS "__driDriverExtensions" + +/** + * This symbol replaces the __DRI_DRIVER_EXTENSIONS symbol, and will be + * suffixed by "_drivername", allowing multiple drivers to be built into one + * library, and also giving the driver the chance to return a variable driver + * extensions struct depending on the driver name being loaded or any other + * system state. + * + * The function prototype is: + * + * const __DRIextension **__driDriverGetExtensions_drivername(void); + */ +#define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions" + +/** + * Tokens for __DRIconfig attribs. A number of attributes defined by + * GLX or EGL standards are not in the table, as they must be provided + * by the loader. For example, FBConfig ID or visual ID, drawable type. + */ + +#define __DRI_ATTRIB_BUFFER_SIZE 1 +#define __DRI_ATTRIB_LEVEL 2 +#define __DRI_ATTRIB_RED_SIZE 3 +#define __DRI_ATTRIB_GREEN_SIZE 4 +#define __DRI_ATTRIB_BLUE_SIZE 5 +#define __DRI_ATTRIB_LUMINANCE_SIZE 6 +#define __DRI_ATTRIB_ALPHA_SIZE 7 +#define __DRI_ATTRIB_ALPHA_MASK_SIZE 8 +#define __DRI_ATTRIB_DEPTH_SIZE 9 +#define __DRI_ATTRIB_STENCIL_SIZE 10 +#define __DRI_ATTRIB_ACCUM_RED_SIZE 11 +#define __DRI_ATTRIB_ACCUM_GREEN_SIZE 12 +#define __DRI_ATTRIB_ACCUM_BLUE_SIZE 13 +#define __DRI_ATTRIB_ACCUM_ALPHA_SIZE 14 +#define __DRI_ATTRIB_SAMPLE_BUFFERS 15 +#define __DRI_ATTRIB_SAMPLES 16 +#define __DRI_ATTRIB_RENDER_TYPE 17 +#define __DRI_ATTRIB_CONFIG_CAVEAT 18 +#define __DRI_ATTRIB_CONFORMANT 19 +#define __DRI_ATTRIB_DOUBLE_BUFFER 20 +#define __DRI_ATTRIB_STEREO 21 +#define __DRI_ATTRIB_AUX_BUFFERS 22 +#define __DRI_ATTRIB_TRANSPARENT_TYPE 23 +#define __DRI_ATTRIB_TRANSPARENT_INDEX_VALUE 24 +#define __DRI_ATTRIB_TRANSPARENT_RED_VALUE 25 +#define __DRI_ATTRIB_TRANSPARENT_GREEN_VALUE 26 +#define __DRI_ATTRIB_TRANSPARENT_BLUE_VALUE 27 +#define __DRI_ATTRIB_TRANSPARENT_ALPHA_VALUE 28 +#define __DRI_ATTRIB_FLOAT_MODE 29 +#define __DRI_ATTRIB_RED_MASK 30 +#define __DRI_ATTRIB_GREEN_MASK 31 +#define __DRI_ATTRIB_BLUE_MASK 32 +#define __DRI_ATTRIB_ALPHA_MASK 33 +#define __DRI_ATTRIB_MAX_PBUFFER_WIDTH 34 +#define __DRI_ATTRIB_MAX_PBUFFER_HEIGHT 35 +#define __DRI_ATTRIB_MAX_PBUFFER_PIXELS 36 +#define __DRI_ATTRIB_OPTIMAL_PBUFFER_WIDTH 37 +#define __DRI_ATTRIB_OPTIMAL_PBUFFER_HEIGHT 38 +#define __DRI_ATTRIB_VISUAL_SELECT_GROUP 39 +#define __DRI_ATTRIB_SWAP_METHOD 40 +#define __DRI_ATTRIB_MAX_SWAP_INTERVAL 41 +#define __DRI_ATTRIB_MIN_SWAP_INTERVAL 42 +#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGB 43 +#define __DRI_ATTRIB_BIND_TO_TEXTURE_RGBA 44 +#define __DRI_ATTRIB_BIND_TO_MIPMAP_TEXTURE 45 +#define __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS 46 +#define __DRI_ATTRIB_YINVERTED 47 +#define __DRI_ATTRIB_FRAMEBUFFER_SRGB_CAPABLE 48 + +/* __DRI_ATTRIB_RENDER_TYPE */ +#define __DRI_ATTRIB_RGBA_BIT 0x01 +#define __DRI_ATTRIB_COLOR_INDEX_BIT 0x02 +#define __DRI_ATTRIB_LUMINANCE_BIT 0x04 +#define __DRI_ATTRIB_FLOAT_BIT 0x08 +#define __DRI_ATTRIB_UNSIGNED_FLOAT_BIT 0x10 + +/* __DRI_ATTRIB_CONFIG_CAVEAT */ +#define __DRI_ATTRIB_SLOW_BIT 0x01 +#define __DRI_ATTRIB_NON_CONFORMANT_CONFIG 0x02 + +/* __DRI_ATTRIB_TRANSPARENT_TYPE */ +#define __DRI_ATTRIB_TRANSPARENT_RGB 0x00 +#define __DRI_ATTRIB_TRANSPARENT_INDEX 0x01 + +/* __DRI_ATTRIB_BIND_TO_TEXTURE_TARGETS */ +#define __DRI_ATTRIB_TEXTURE_1D_BIT 0x01 +#define __DRI_ATTRIB_TEXTURE_2D_BIT 0x02 +#define __DRI_ATTRIB_TEXTURE_RECTANGLE_BIT 0x04 + +/** + * This extension defines the core DRI functionality. + */ +#define __DRI_CORE "DRI_Core" +#define __DRI_CORE_VERSION 1 + +struct __DRIcoreExtensionRec { + __DRIextension base; + + __DRIscreen *(*createNewScreen)(int screen, int fd, + unsigned int sarea_handle, + const __DRIextension **extensions, + const __DRIconfig ***driverConfigs, + void *loaderPrivate); + + void (*destroyScreen)(__DRIscreen *screen); + + const __DRIextension **(*getExtensions)(__DRIscreen *screen); + + int (*getConfigAttrib)(const __DRIconfig *config, + unsigned int attrib, + unsigned int *value); + + int (*indexConfigAttrib)(const __DRIconfig *config, int index, + unsigned int *attrib, unsigned int *value); + + __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen, + const __DRIconfig *config, + unsigned int drawable_id, + unsigned int head, + void *loaderPrivate); + + void (*destroyDrawable)(__DRIdrawable *drawable); + + void (*swapBuffers)(__DRIdrawable *drawable); + + __DRIcontext *(*createNewContext)(__DRIscreen *screen, + const __DRIconfig *config, + __DRIcontext *shared, + void *loaderPrivate); + + int (*copyContext)(__DRIcontext *dest, + __DRIcontext *src, + unsigned long mask); + + void (*destroyContext)(__DRIcontext *context); + + int (*bindContext)(__DRIcontext *ctx, + __DRIdrawable *pdraw, + __DRIdrawable *pread); + + int (*unbindContext)(__DRIcontext *ctx); +}; + +/** + * Stored version of some component (i.e., server-side DRI module, kernel-side + * DRM, etc.). + * + * \todo + * There are several data structures that explicitly store a major version, + * minor version, and patch level. These structures should be modified to + * have a \c __DRIversionRec instead. + */ +struct __DRIversionRec { + int major; /**< Major version number. */ + int minor; /**< Minor version number. */ + int patch; /**< Patch-level. */ +}; + +/** + * Framebuffer information record. Used by libGL to communicate information + * about the framebuffer to the driver's \c __driCreateNewScreen function. + * + * In XFree86, most of this information is derrived from data returned by + * calling \c XF86DRIGetDeviceInfo. + * + * \sa XF86DRIGetDeviceInfo __DRIdisplayRec::createNewScreen + * __driUtilCreateNewScreen CallCreateNewScreen + * + * \bug This structure could be better named. + */ +struct __DRIframebufferRec { + unsigned char *base; /**< Framebuffer base address in the CPU's + * address space. This value is calculated by + * calling \c drmMap on the framebuffer handle + * returned by \c XF86DRIGetDeviceInfo (or a + * similar function). + */ + int size; /**< Framebuffer size, in bytes. */ + int stride; /**< Number of bytes from one line to the next. */ + int width; /**< Pixel width of the framebuffer. */ + int height; /**< Pixel height of the framebuffer. */ + int dev_priv_size; /**< Size of the driver's dev-priv structure. */ + void *dev_priv; /**< Pointer to the driver's dev-priv structure. */ +}; + + +/** + * This extension provides alternative screen, drawable and context + * constructors for legacy DRI functionality. This is used in + * conjunction with the core extension. + */ +#define __DRI_LEGACY "DRI_Legacy" +#define __DRI_LEGACY_VERSION 1 + +struct __DRIlegacyExtensionRec { + __DRIextension base; + + __DRIscreen *(*createNewScreen)(int screen, + const __DRIversion *ddx_version, + const __DRIversion *dri_version, + const __DRIversion *drm_version, + const __DRIframebuffer *frame_buffer, + void *pSAREA, int fd, + const __DRIextension **extensions, + const __DRIconfig ***driver_configs, + void *loaderPrivate); + + __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen, + const __DRIconfig *config, + drm_drawable_t hwDrawable, + int renderType, const int *attrs, + void *loaderPrivate); + + __DRIcontext *(*createNewContext)(__DRIscreen *screen, + const __DRIconfig *config, + int render_type, + __DRIcontext *shared, + drm_context_t hwContext, + void *loaderPrivate); +}; + +/** + * This extension provides alternative screen, drawable and context + * constructors for swrast DRI functionality. This is used in + * conjunction with the core extension. + */ +#define __DRI_SWRAST "DRI_SWRast" +#define __DRI_SWRAST_VERSION 4 + +struct __DRIswrastExtensionRec { + __DRIextension base; + + __DRIscreen *(*createNewScreen)(int screen, + const __DRIextension **extensions, + const __DRIconfig ***driver_configs, + void *loaderPrivate); + + __DRIdrawable *(*createNewDrawable)(__DRIscreen *screen, + const __DRIconfig *config, + void *loaderPrivate); + + /* Since version 2 */ + __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen, + int api, + const __DRIconfig *config, + __DRIcontext *shared, + void *data); + + /** + * Create a context for a particular API with a set of attributes + * + * \since version 3 + * + * \sa __DRIdri2ExtensionRec::createContextAttribs + */ + __DRIcontext *(*createContextAttribs)(__DRIscreen *screen, + int api, + const __DRIconfig *config, + __DRIcontext *shared, + unsigned num_attribs, + const uint32_t *attribs, + unsigned *error, + void *loaderPrivate); + + /** + * createNewScreen() with the driver extensions passed in. + * + * \since version 4 + */ + __DRIscreen *(*createNewScreen2)(int screen, + const __DRIextension **loader_extensions, + const __DRIextension **driver_extensions, + const __DRIconfig ***driver_configs, + void *loaderPrivate); + +}; + +/** Common DRI function definitions, shared among DRI2 and Image extensions + */ + +typedef __DRIscreen * +(*__DRIcreateNewScreen2Func)(int screen, int fd, + const __DRIextension **extensions, + const __DRIextension **driver_extensions, + const __DRIconfig ***driver_configs, + void *loaderPrivate); + +typedef __DRIdrawable * +(*__DRIcreateNewDrawableFunc)(__DRIscreen *screen, + const __DRIconfig *config, + void *loaderPrivate); + +typedef __DRIcontext * +(*__DRIcreateContextAttribsFunc)(__DRIscreen *screen, + int api, + const __DRIconfig *config, + __DRIcontext *shared, + unsigned num_attribs, + const uint32_t *attribs, + unsigned *error, + void *loaderPrivate); + +typedef unsigned int +(*__DRIgetAPIMaskFunc)(__DRIscreen *screen); + +/** + * DRI2 Loader extension. + */ +#define __DRI_BUFFER_FRONT_LEFT 0 +#define __DRI_BUFFER_BACK_LEFT 1 +#define __DRI_BUFFER_FRONT_RIGHT 2 +#define __DRI_BUFFER_BACK_RIGHT 3 +#define __DRI_BUFFER_DEPTH 4 +#define __DRI_BUFFER_STENCIL 5 +#define __DRI_BUFFER_ACCUM 6 +#define __DRI_BUFFER_FAKE_FRONT_LEFT 7 +#define __DRI_BUFFER_FAKE_FRONT_RIGHT 8 +#define __DRI_BUFFER_DEPTH_STENCIL 9 /**< Only available with DRI2 1.1 */ +#define __DRI_BUFFER_HIZ 10 + +/* Inofficial and for internal use. Increase when adding a new buffer token. */ +#define __DRI_BUFFER_COUNT 11 + +struct __DRIbufferRec { + unsigned int attachment; + unsigned int name; + unsigned int pitch; + unsigned int cpp; + unsigned int flags; +}; + +#define __DRI_DRI2_LOADER "DRI_DRI2Loader" +#define __DRI_DRI2_LOADER_VERSION 3 +struct __DRIdri2LoaderExtensionRec { + __DRIextension base; + + __DRIbuffer *(*getBuffers)(__DRIdrawable *driDrawable, + int *width, int *height, + unsigned int *attachments, int count, + int *out_count, void *loaderPrivate); + + /** + * Flush pending front-buffer rendering + * + * Any rendering that has been performed to the + * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the + * \c __DRI_BUFFER_FRONT_LEFT. + * + * \param driDrawable Drawable whose front-buffer is to be flushed + * \param loaderPrivate Loader's private data that was previously passed + * into __DRIdri2ExtensionRec::createNewDrawable + * + * \since 2 + */ + void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate); + + + /** + * Get list of buffers from the server + * + * Gets a list of buffer for the specified set of attachments. Unlike + * \c ::getBuffers, this function takes a list of attachments paired with + * opaque \c unsigned \c int value describing the format of the buffer. + * It is the responsibility of the caller to know what the service that + * allocates the buffers will expect to receive for the format. + * + * \param driDrawable Drawable whose buffers are being queried. + * \param width Output where the width of the buffers is stored. + * \param height Output where the height of the buffers is stored. + * \param attachments List of pairs of attachment ID and opaque format + * requested for the drawable. + * \param count Number of attachment / format pairs stored in + * \c attachments. + * \param loaderPrivate Loader's private data that was previously passed + * into __DRIdri2ExtensionRec::createNewDrawable. + * + * \since 3 + */ + __DRIbuffer *(*getBuffersWithFormat)(__DRIdrawable *driDrawable, + int *width, int *height, + unsigned int *attachments, int count, + int *out_count, void *loaderPrivate); +}; + +/** + * This extension provides alternative screen, drawable and context + * constructors for DRI2. + */ +#define __DRI_DRI2 "DRI_DRI2" +#define __DRI_DRI2_VERSION 4 + +#define __DRI_API_OPENGL 0 /**< OpenGL compatibility profile */ +#define __DRI_API_GLES 1 /**< OpenGL ES 1.x */ +#define __DRI_API_GLES2 2 /**< OpenGL ES 2.x */ +#define __DRI_API_OPENGL_CORE 3 /**< OpenGL 3.2+ core profile */ +#define __DRI_API_GLES3 4 /**< OpenGL ES 3.x */ + +#define __DRI_CTX_ATTRIB_MAJOR_VERSION 0 +#define __DRI_CTX_ATTRIB_MINOR_VERSION 1 +#define __DRI_CTX_ATTRIB_FLAGS 2 + +/** + * \requires __DRI2_ROBUSTNESS. + */ +#define __DRI_CTX_ATTRIB_RESET_STRATEGY 3 + +#define __DRI_CTX_FLAG_DEBUG 0x00000001 +#define __DRI_CTX_FLAG_FORWARD_COMPATIBLE 0x00000002 + +/** + * \requires __DRI2_ROBUSTNESS. + */ +#define __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS 0x00000004 + +/** + * \name Context reset strategies. + */ +/*@{*/ +#define __DRI_CTX_RESET_NO_NOTIFICATION 0 +#define __DRI_CTX_RESET_LOSE_CONTEXT 1 +/*@}*/ + +/** + * \name Reasons that __DRIdri2Extension::createContextAttribs might fail + */ +/*@{*/ +/** Success! */ +#define __DRI_CTX_ERROR_SUCCESS 0 + +/** Memory allocation failure */ +#define __DRI_CTX_ERROR_NO_MEMORY 1 + +/** Client requested an API (e.g., OpenGL ES 2.0) that the driver can't do. */ +#define __DRI_CTX_ERROR_BAD_API 2 + +/** Client requested an API version that the driver can't do. */ +#define __DRI_CTX_ERROR_BAD_VERSION 3 + +/** Client requested a flag or combination of flags the driver can't do. */ +#define __DRI_CTX_ERROR_BAD_FLAG 4 + +/** Client requested an attribute the driver doesn't understand. */ +#define __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE 5 + +/** Client requested a flag the driver doesn't understand. */ +#define __DRI_CTX_ERROR_UNKNOWN_FLAG 6 +/*@}*/ + +struct __DRIdri2ExtensionRec { + __DRIextension base; + + __DRIscreen *(*createNewScreen)(int screen, int fd, + const __DRIextension **extensions, + const __DRIconfig ***driver_configs, + void *loaderPrivate); + + __DRIcreateNewDrawableFunc createNewDrawable; + __DRIcontext *(*createNewContext)(__DRIscreen *screen, + const __DRIconfig *config, + __DRIcontext *shared, + void *loaderPrivate); + + /* Since version 2 */ + __DRIgetAPIMaskFunc getAPIMask; + + __DRIcontext *(*createNewContextForAPI)(__DRIscreen *screen, + int api, + const __DRIconfig *config, + __DRIcontext *shared, + void *data); + + __DRIbuffer *(*allocateBuffer)(__DRIscreen *screen, + unsigned int attachment, + unsigned int format, + int width, + int height); + void (*releaseBuffer)(__DRIscreen *screen, + __DRIbuffer *buffer); + + /** + * Create a context for a particular API with a set of attributes + * + * \since version 3 + * + * \sa __DRIswrastExtensionRec::createContextAttribs + */ + __DRIcreateContextAttribsFunc createContextAttribs; + + /** + * createNewScreen with the driver's extension list passed in. + * + * \since version 4 + */ + __DRIcreateNewScreen2Func createNewScreen2; +}; + + +/** + * This extension provides functionality to enable various EGLImage + * extensions. + */ +#define __DRI_IMAGE "DRI_IMAGE" +#define __DRI_IMAGE_VERSION 11 + +/** + * These formats correspond to the similarly named MESA_FORMAT_* + * tokens, except in the native endian of the CPU. For example, on + * little endian __DRI_IMAGE_FORMAT_XRGB8888 corresponds to + * MESA_FORMAT_XRGB8888, but MESA_FORMAT_XRGB8888_REV on big endian. + * + * __DRI_IMAGE_FORMAT_NONE is for images that aren't directly usable + * by the driver (YUV planar formats) but serve as a base image for + * creating sub-images for the different planes within the image. + * + * R8, GR88 and NONE should not be used with createImageFormName or + * createImage, and are returned by query from sub images created with + * createImageFromNames (NONE, see above) and fromPlane (R8 & GR88). + */ +#define __DRI_IMAGE_FORMAT_RGB565 0x1001 +#define __DRI_IMAGE_FORMAT_XRGB8888 0x1002 +#define __DRI_IMAGE_FORMAT_ARGB8888 0x1003 +#define __DRI_IMAGE_FORMAT_ABGR8888 0x1004 +#define __DRI_IMAGE_FORMAT_XBGR8888 0x1005 +#define __DRI_IMAGE_FORMAT_R8 0x1006 /* Since version 5 */ +#define __DRI_IMAGE_FORMAT_GR88 0x1007 +#define __DRI_IMAGE_FORMAT_NONE 0x1008 +#define __DRI_IMAGE_FORMAT_XRGB2101010 0x1009 +#define __DRI_IMAGE_FORMAT_ARGB2101010 0x100a +#define __DRI_IMAGE_FORMAT_SARGB8 0x100b + +#define __DRI_IMAGE_USE_SHARE 0x0001 +#define __DRI_IMAGE_USE_SCANOUT 0x0002 +#define __DRI_IMAGE_USE_CURSOR 0x0004 /* Depricated */ +#define __DRI_IMAGE_USE_LINEAR 0x0008 + + +/** + * Four CC formats that matches with WL_DRM_FORMAT_* from wayland_drm.h + * and GBM_FORMAT_* from gbm.h, used with createImageFromNames. + * + * \since 5 + */ + +#define __DRI_IMAGE_FOURCC_RGB565 0x36314752 +#define __DRI_IMAGE_FOURCC_ARGB8888 0x34325241 +#define __DRI_IMAGE_FOURCC_XRGB8888 0x34325258 +#define __DRI_IMAGE_FOURCC_ABGR8888 0x34324241 +#define __DRI_IMAGE_FOURCC_XBGR8888 0x34324258 +#define __DRI_IMAGE_FOURCC_SARGB8888 0x83324258 +#define __DRI_IMAGE_FOURCC_YUV410 0x39565559 +#define __DRI_IMAGE_FOURCC_YUV411 0x31315559 +#define __DRI_IMAGE_FOURCC_YUV420 0x32315559 +#define __DRI_IMAGE_FOURCC_YUV422 0x36315559 +#define __DRI_IMAGE_FOURCC_YUV444 0x34325559 +#define __DRI_IMAGE_FOURCC_NV12 0x3231564e +#define __DRI_IMAGE_FOURCC_NV16 0x3631564e +#define __DRI_IMAGE_FOURCC_YUYV 0x56595559 + + +/** + * Queryable on images created by createImageFromNames. + * + * RGB and RGBA are may be usable directly as images but its still + * recommended to call fromPlanar with plane == 0. + * + * Y_U_V, Y_UV and Y_XUXV all requires call to fromPlanar to create + * usable sub-images, sampling from images return raw YUV data and + * color conversion needs to be done in the shader. + * + * \since 5 + */ + +#define __DRI_IMAGE_COMPONENTS_RGB 0x3001 +#define __DRI_IMAGE_COMPONENTS_RGBA 0x3002 +#define __DRI_IMAGE_COMPONENTS_Y_U_V 0x3003 +#define __DRI_IMAGE_COMPONENTS_Y_UV 0x3004 +#define __DRI_IMAGE_COMPONENTS_Y_XUXV 0x3005 + + +/** + * queryImage attributes + */ + +#define __DRI_IMAGE_ATTRIB_STRIDE 0x2000 +#define __DRI_IMAGE_ATTRIB_HANDLE 0x2001 +#define __DRI_IMAGE_ATTRIB_NAME 0x2002 +#define __DRI_IMAGE_ATTRIB_FORMAT 0x2003 /* available in versions 3+ */ +#define __DRI_IMAGE_ATTRIB_WIDTH 0x2004 /* available in versions 4+ */ +#define __DRI_IMAGE_ATTRIB_HEIGHT 0x2005 +#define __DRI_IMAGE_ATTRIB_COMPONENTS 0x2006 /* available in versions 5+ */ +#define __DRI_IMAGE_ATTRIB_FD 0x2007 /* available in versions + * 7+. Each query will return a + * new fd. */ +#define __DRI_IMAGE_ATTRIB_FOURCC 0x2008 /* available in versions 11 */ +#define __DRI_IMAGE_ATTRIB_NUM_PLANES 0x2009 /* available in versions 11 */ + +enum __DRIYUVColorSpace { + __DRI_YUV_COLOR_SPACE_UNDEFINED = 0, + __DRI_YUV_COLOR_SPACE_ITU_REC601 = 0x327F, + __DRI_YUV_COLOR_SPACE_ITU_REC709 = 0x3280, + __DRI_YUV_COLOR_SPACE_ITU_REC2020 = 0x3281 +}; + +enum __DRISampleRange { + __DRI_YUV_RANGE_UNDEFINED = 0, + __DRI_YUV_FULL_RANGE = 0x3282, + __DRI_YUV_NARROW_RANGE = 0x3283 +}; + +enum __DRIChromaSiting { + __DRI_YUV_CHROMA_SITING_UNDEFINED = 0, + __DRI_YUV_CHROMA_SITING_0 = 0x3284, + __DRI_YUV_CHROMA_SITING_0_5 = 0x3285 +}; + +/** + * \name Reasons that __DRIimageExtensionRec::createImageFromTexture might fail + */ +/*@{*/ +/** Success! */ +#define __DRI_IMAGE_ERROR_SUCCESS 0 + +/** Memory allocation failure */ +#define __DRI_IMAGE_ERROR_BAD_ALLOC 1 + +/** Client requested an invalid attribute for a texture object */ +#define __DRI_IMAGE_ERROR_BAD_MATCH 2 + +/** Client requested an invalid texture object */ +#define __DRI_IMAGE_ERROR_BAD_PARAMETER 3 +/*@}*/ + +/** + * \name Capabilities that might be returned by __DRIimageExtensionRec::getCapabilities + */ +/*@{*/ +#define __DRI_IMAGE_CAP_GLOBAL_NAMES 1 +/*@}*/ + +/** + * blitImage flags + */ + +#define __BLIT_FLAG_FLUSH 0x0001 +#define __BLIT_FLAG_FINISH 0x0002 + +typedef struct __DRIimageRec __DRIimage; +typedef struct __DRIimageExtensionRec __DRIimageExtension; +struct __DRIimageExtensionRec { + __DRIextension base; + + __DRIimage *(*createImageFromName)(__DRIscreen *screen, + int width, int height, int format, + int name, int pitch, + void *loaderPrivate); + + __DRIimage *(*createImageFromRenderbuffer)(__DRIcontext *context, + int renderbuffer, + void *loaderPrivate); + + void (*destroyImage)(__DRIimage *image); + + __DRIimage *(*createImage)(__DRIscreen *screen, + int width, int height, int format, + unsigned int use, + void *loaderPrivate); + + GLboolean (*queryImage)(__DRIimage *image, int attrib, int *value); + + /** + * The new __DRIimage will share the content with the old one, see dup(2). + */ + __DRIimage *(*dupImage)(__DRIimage *image, void *loaderPrivate); + + /** + * Validate that a __DRIimage can be used a certain way. + * + * \since 2 + */ + GLboolean (*validateUsage)(__DRIimage *image, unsigned int use); + + /** + * Unlike createImageFromName __DRI_IMAGE_FORMAT is not but instead + * __DRI_IMAGE_FOURCC and strides are in bytes not pixels. Stride is + * also per block and not per pixel (for non-RGB, see gallium blocks). + * + * \since 5 + */ + __DRIimage *(*createImageFromNames)(__DRIscreen *screen, + int width, int height, int fourcc, + int *names, int num_names, + int *strides, int *offsets, + void *loaderPrivate); + + /** + * Create an image out of a sub-region of a parent image. This + * entry point lets us create individual __DRIimages for different + * planes in a planar buffer (typically yuv), for example. While a + * sub-image shares the underlying buffer object with the parent + * image and other sibling sub-images, the life times of parent and + * sub-images are not dependent. Destroying the parent or a + * sub-image doesn't affect other images. The underlying buffer + * object is free when no __DRIimage remains that references it. + * + * Sub-images may overlap, but rendering to overlapping sub-images + * is undefined. + * + * \since 5 + */ + __DRIimage *(*fromPlanar)(__DRIimage *image, int plane, + void *loaderPrivate); + + /** + * Create image from texture. + * + * \since 6 + */ + __DRIimage *(*createImageFromTexture)(__DRIcontext *context, + int target, + unsigned texture, + int depth, + int level, + unsigned *error, + void *loaderPrivate); + /** + * Like createImageFromNames, but takes a prime fd instead. + * + * \since 7 + */ + __DRIimage *(*createImageFromFds)(__DRIscreen *screen, + int width, int height, int fourcc, + int *fds, int num_fds, + int *strides, int *offsets, + void *loaderPrivate); + + /** + * Like createImageFromFds, but takes additional attributes. + * + * For EGL_EXT_image_dma_buf_import. + * + * \since 8 + */ + __DRIimage *(*createImageFromDmaBufs)(__DRIscreen *screen, + int width, int height, int fourcc, + int *fds, int num_fds, + int *strides, int *offsets, + enum __DRIYUVColorSpace color_space, + enum __DRISampleRange sample_range, + enum __DRIChromaSiting horiz_siting, + enum __DRIChromaSiting vert_siting, + unsigned *error, + void *loaderPrivate); + + /** + * Blit a part of a __DRIimage to another and flushes + * + * flush_flag: + * 0: no flush + * __BLIT_FLAG_FLUSH: flush after the blit operation + * __BLIT_FLAG_FINISH: flush and wait the blit finished + * + * \since 9 + */ + void (*blitImage)(__DRIcontext *context, __DRIimage *dst, __DRIimage *src, + int dstx0, int dsty0, int dstwidth, int dstheight, + int srcx0, int srcy0, int srcwidth, int srcheight, + int flush_flag); + + /** + * Query for general capabilities of the driver that concern + * buffer sharing and image importing. + * + * \since 10 + */ + int (*getCapabilities)(__DRIscreen *screen); +}; + + +/** + * This extension must be implemented by the loader and passed to the + * driver at screen creation time. The EGLImage entry points in the + * various client APIs take opaque EGLImage handles and use this + * extension to map them to a __DRIimage. At version 1, this + * extensions allows mapping EGLImage pointers to __DRIimage pointers, + * but future versions could support other EGLImage-like, opaque types + * with new lookup functions. + */ +#define __DRI_IMAGE_LOOKUP "DRI_IMAGE_LOOKUP" +#define __DRI_IMAGE_LOOKUP_VERSION 1 + +typedef struct __DRIimageLookupExtensionRec __DRIimageLookupExtension; +struct __DRIimageLookupExtensionRec { + __DRIextension base; + + __DRIimage *(*lookupEGLImage)(__DRIscreen *screen, void *image, + void *loaderPrivate); +}; + +/** + * This extension allows for common DRI2 options + */ +#define __DRI2_CONFIG_QUERY "DRI_CONFIG_QUERY" +#define __DRI2_CONFIG_QUERY_VERSION 1 + +typedef struct __DRI2configQueryExtensionRec __DRI2configQueryExtension; +struct __DRI2configQueryExtensionRec { + __DRIextension base; + + int (*configQueryb)(__DRIscreen *screen, const char *var, unsigned char *val); + int (*configQueryi)(__DRIscreen *screen, const char *var, int *val); + int (*configQueryf)(__DRIscreen *screen, const char *var, float *val); +}; + +/** + * Robust context driver extension. + * + * Existence of this extension means the driver can accept the + * \c __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS flag and the + * \c __DRI_CTX_ATTRIB_RESET_STRATEGY attribute in + * \c __DRIdri2ExtensionRec::createContextAttribs. + */ +#define __DRI2_ROBUSTNESS "DRI_Robustness" +#define __DRI2_ROBUSTNESS_VERSION 1 + +typedef struct __DRIrobustnessExtensionRec __DRIrobustnessExtension; +struct __DRIrobustnessExtensionRec { + __DRIextension base; +}; + +/** + * DRI config options extension. + * + * This extension provides the XML string containing driver options for use by + * the loader in supporting the driconf application. + */ +#define __DRI_CONFIG_OPTIONS "DRI_ConfigOptions" +#define __DRI_CONFIG_OPTIONS_VERSION 1 + +typedef struct __DRIconfigOptionsExtensionRec { + __DRIextension base; + const char *xml; +} __DRIconfigOptionsExtension; + +/** + * This extension provides a driver vtable to a set of common driver helper + * functions (driCoreExtension, driDRI2Extension) within the driver + * implementation, as opposed to having to pass them through a global + * variable. + * + * It is not intended to be public API to the actual loader, and the vtable + * layout may change at any time. + */ +#define __DRI_DRIVER_VTABLE "DRI_DriverVtable" +#define __DRI_DRIVER_VTABLE_VERSION 1 + +typedef struct __DRIDriverVtableExtensionRec { + __DRIextension base; + const struct __DriverAPIRec *vtable; +} __DRIDriverVtableExtension; + +/** + * Query renderer driver extension + * + * This allows the window system layer (either EGL or GLX) to query aspects of + * hardware and driver support without creating a context. + */ +#define __DRI2_RENDERER_QUERY "DRI_RENDERER_QUERY" +#define __DRI2_RENDERER_QUERY_VERSION 1 + +#define __DRI2_RENDERER_VENDOR_ID 0x0000 +#define __DRI2_RENDERER_DEVICE_ID 0x0001 +#define __DRI2_RENDERER_VERSION 0x0002 +#define __DRI2_RENDERER_ACCELERATED 0x0003 +#define __DRI2_RENDERER_VIDEO_MEMORY 0x0004 +#define __DRI2_RENDERER_UNIFIED_MEMORY_ARCHITECTURE 0x0005 +#define __DRI2_RENDERER_PREFERRED_PROFILE 0x0006 +#define __DRI2_RENDERER_OPENGL_CORE_PROFILE_VERSION 0x0007 +#define __DRI2_RENDERER_OPENGL_COMPATIBILITY_PROFILE_VERSION 0x0008 +#define __DRI2_RENDERER_OPENGL_ES_PROFILE_VERSION 0x0009 +#define __DRI2_RENDERER_OPENGL_ES2_PROFILE_VERSION 0x000a + +typedef struct __DRI2rendererQueryExtensionRec __DRI2rendererQueryExtension; +struct __DRI2rendererQueryExtensionRec { + __DRIextension base; + + int (*queryInteger)(__DRIscreen *screen, int attribute, unsigned int *val); + int (*queryString)(__DRIscreen *screen, int attribute, const char **val); +}; + +/** + * Image Loader extension. Drivers use this to allocate color buffers + */ + +enum __DRIimageBufferMask { + __DRI_IMAGE_BUFFER_BACK = (1 << 0), + __DRI_IMAGE_BUFFER_FRONT = (1 << 1) +}; + +struct __DRIimageList { + uint32_t image_mask; + __DRIimage *back; + __DRIimage *front; +}; + +#define __DRI_IMAGE_LOADER "DRI_IMAGE_LOADER" +#define __DRI_IMAGE_LOADER_VERSION 1 + +struct __DRIimageLoaderExtensionRec { + __DRIextension base; + + /** + * Allocate color buffers. + * + * \param driDrawable + * \param width Width of allocated buffers + * \param height Height of allocated buffers + * \param format one of __DRI_IMAGE_FORMAT_* + * \param stamp Address of variable to be updated when + * getBuffers must be called again + * \param loaderPrivate The loaderPrivate for driDrawable + * \param buffer_mask Set of buffers to allocate + * \param buffers Returned buffers + */ + int (*getBuffers)(__DRIdrawable *driDrawable, + unsigned int format, + uint32_t *stamp, + void *loaderPrivate, + uint32_t buffer_mask, + struct __DRIimageList *buffers); + + /** + * Flush pending front-buffer rendering + * + * Any rendering that has been performed to the + * fake front will be flushed to the front + * + * \param driDrawable Drawable whose front-buffer is to be flushed + * \param loaderPrivate Loader's private data that was previously passed + * into __DRIdri2ExtensionRec::createNewDrawable + */ + void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate); +}; + +/** + * DRI extension. + */ + +#define __DRI_IMAGE_DRIVER "DRI_IMAGE_DRIVER" +#define __DRI_IMAGE_DRIVER_VERSION 1 + +struct __DRIimageDriverExtensionRec { + __DRIextension base; + + /* Common DRI functions, shared with DRI2 */ + __DRIcreateNewScreen2Func createNewScreen2; + __DRIcreateNewDrawableFunc createNewDrawable; + __DRIcreateContextAttribsFunc createContextAttribs; + __DRIgetAPIMaskFunc getAPIMask; +}; + +#endif diff --cc mesalib/src/loader/Android.mk index 8daeedf,8e215de..8e215de mode 100755,100644..100755 --- a/mesalib/src/loader/Android.mk +++ b/mesalib/src/loader/Android.mk diff --cc mesalib/src/mapi/glapi/gen/glX_proto_send.py index 1419a7c,b93989f..b93989f mode 100755,100644..100755 --- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py diff --cc mesalib/src/mapi/glapi/gen/glX_proto_size.py index 26a2fdf,4737fbf..b10c26f mode 100755,100644..100755 --- a/mesalib/src/mapi/glapi/gen/glX_proto_size.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_size.py diff --cc mesalib/src/mesa/main/macros.h index 5680b2e,0608650..2a5731f mode 100755,100644..100755 --- a/mesalib/src/mesa/main/macros.h +++ b/mesalib/src/mesa/main/macros.h diff --cc xorg-server/glx/util/macros.h index 6c7bda7,0000000..3b708ed mode 100644,000000..100644 --- a/xorg-server/glx/util/macros.h +++ b/xorg-server/glx/util/macros.h @@@ -1,186 -1,0 +1,188 @@@ +/* + * Copyright © 2014 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. + */ + +#ifndef UTIL_MACROS_H +#define UTIL_MACROS_H + +/* Compute the size of an array */ +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) +#endif + +/* For compatibility with Clang's __has_builtin() */ +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +/** + * __builtin_expect macros + */ +#if !defined(HAVE___BUILTIN_EXPECT) +# define __builtin_expect(x, y) (x) +#endif + +#ifndef likely +# ifdef HAVE___BUILTIN_EXPECT +# define likely(x) __builtin_expect(!!(x), 1) +# define unlikely(x) __builtin_expect(!!(x), 0) +# else +# define likely(x) (x) +# define unlikely(x) (x) +# endif +#endif + + +/** + * Static (compile-time) assertion. + * Basically, use COND to dimension an array. If COND is false/zero the + * array size will be -1 and we'll get a compilation error. + */ +#define STATIC_ASSERT(COND) \ + do { \ + (void) sizeof(char [1 - 2*!(COND)]); \ + } while (0) + + +/** + * Unreachable macro. Useful for suppressing "control reaches end of non-void + * function" warnings. + */ +#ifdef HAVE___BUILTIN_UNREACHABLE +#define unreachable(str) \ +do { \ + assert(!str); \ + __builtin_unreachable(); \ +} while (0) +#elif defined (_MSC_VER) +#define unreachable(str) \ +do { \ + assert(!str); \ + __assume(0); \ +} while (0) +#else +#define unreachable(str) assert(!str) +#endif + +/** + * Assume macro. Useful for expressing our assumptions to the compiler, + * typically for purposes of silencing warnings. + */ +#if __has_builtin(__builtin_assume) +#define assume(expr) \ +do { \ + assert(expr); \ + __builtin_assume(expr); \ +} while (0) +#elif defined HAVE___BUILTIN_UNREACHABLE +#define assume(expr) ((expr) ? ((void) 0) \ + : (assert(!"assumption failed"), \ + __builtin_unreachable())) +#elif defined (_MSC_VER) +#define assume(expr) __assume(expr) +#else +#define assume(expr) assert(expr) +#endif + +#ifdef HAVE_FUNC_ATTRIBUTE_FLATTEN +#define FLATTEN __attribute__((__flatten__)) +#else +#define FLATTEN +#endif + +#ifdef HAVE_FUNC_ATTRIBUTE_FORMAT +#define PRINTFLIKE(f, a) __attribute__ ((format(__printf__, f, a))) +#else +#define PRINTFLIKE(f, a) +#endif + +#ifdef HAVE_FUNC_ATTRIBUTE_MALLOC +#define MALLOCLIKE __attribute__((__malloc__)) +#else +#define MALLOCLIKE +#endif + +/* Used to optionally mark structures with misaligned elements or size as + * packed, to trade off performance for space. + */ +#ifdef HAVE_FUNC_ATTRIBUTE_PACKED +#define PACKED __attribute__((__packed__)) +#else +#define PACKED +#endif + +#ifdef __cplusplus +/** + * Macro function that evaluates to true if T is a trivially + * destructible type -- that is, if its (non-virtual) destructor + * performs no action and all member variables and base classes are + * trivially destructible themselves. + */ +# if defined(__GNUC__) +# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T) +# endif +# elif (defined(__clang__) && defined(__has_feature)) +# if __has_feature(has_trivial_destructor) +# define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T) +# endif +# endif +# ifndef HAS_TRIVIAL_DESTRUCTOR + /* It's always safe (if inefficient) to assume that a + * destructor is non-trivial. + */ +# define HAS_TRIVIAL_DESTRUCTOR(T) (false) +# endif +#endif + +/** + * PUBLIC/USED macros + * + * If we build the library with gcc's -fvisibility=hidden flag, we'll + * use the PUBLIC macro to mark functions that are to be exported. + * + * We also need to define a USED attribute, so the optimizer doesn't + * inline a static function that we later use in an alias. - ajax + */ +#ifndef PUBLIC +# if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) +# define PUBLIC __attribute__((visibility("default"))) +# define USED __attribute__((used)) +# elif defined(_MSC_VER) +# define PUBLIC __declspec(dllexport) +# define USED +# else +# define PUBLIC +# define USED +# endif +#endif + +#ifdef HAVE_FUNC_ATTRIBUTE_UNUSED +#define UNUSED __attribute__((unused)) +#else +#define UNUSED +#endif + ++/** Compute ceiling of integer quotient of A divided by B. */ ++#define DIV_ROUND_UP( A, B ) ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 ) + +#endif /* UTIL_MACROS_H */ -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits