diff options
| -rw-r--r-- | mesalib/configure.ac | 55 | ||||
| -rw-r--r-- | mesalib/docs/faq.html | 43 | ||||
| -rw-r--r-- | mesalib/docs/index.html | 10 | ||||
| -rw-r--r-- | mesalib/docs/relnotes-9.0.html | 6 | ||||
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/glX_proto_send.py | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_cpal.c | 15 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texcompress_cpal.h | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 4 | ||||
| -rw-r--r-- | xorg-server/dix/events.c | 16 | ||||
| -rw-r--r-- | xorg-server/os/osinit.c | 2 |
10 files changed, 57 insertions, 99 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 72c2b8c58..6c7a1929e 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -599,11 +599,6 @@ AC_ARG_ENABLE([vdpau], [enable vdpau library @<:@default=auto@:>@])], [enable_vdpau="$enableval"], [enable_vdpau=auto]) -AC_ARG_ENABLE([va], - [AS_HELP_STRING([--enable-va], - [enable va library @<:@default=auto@:>@])], - [enable_va="$enableval"], - [enable_va=auto]) AC_ARG_ENABLE([opencl], [AS_HELP_STRING([--enable-opencl], [enable OpenCL library @<:@default=no@:>@])], @@ -668,7 +663,6 @@ if test "x$enable_opengl" = xno -a \ "x$enable_d3d1x" = xno -a \ "x$enable_xvmc" = xno -a \ "x$enable_vdpau" = xno -a \ - "x$enable_va" = xno -a \ "x$enable_opencl" = xno; then AC_MSG_ERROR([at least one API should be enabled]) fi @@ -829,10 +823,6 @@ if test "x$enable_glx" = xyes -a "x$no_x" = xyes; then AC_MSG_ERROR([X11 development libraries needed for GLX]) fi -if test "x$enable_glx" = xyes; then - DEFINES="$DEFINES -DUSE_XCB" -fi - dnl Direct rendering or just indirect rendering case "$host_os" in gnu*) @@ -879,7 +869,7 @@ xyesno) fi # find the DRI deps for libGL - dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1" + dri_modules="x11 xext xdamage xfixes x11-xcb xcb-glx >= 1.8.1 xcb-dri2 >= 1.8" # add xf86vidmode if available PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no) @@ -1405,12 +1395,6 @@ if test "x$enable_gallium_g3dvl" = xyes; then if test "x$enable_vdpau" = xauto; then PKG_CHECK_EXISTS([vdpau], [enable_vdpau=yes], [enable_vdpau=no]) fi - - if test "x$enable_va" = xauto; then - #don't enable vaapi state tracker even if package exists - #PKG_CHECK_EXISTS([libva], [enable_vdpau=yes], [enable_vdpau=no]) - enable_va=no - fi fi if test "x$enable_xvmc" = xyes; then @@ -1425,13 +1409,6 @@ if test "x$enable_vdpau" = xyes; then HAVE_ST_VDPAU="yes" fi -if test "x$enable_va" = xyes; then - PKG_CHECK_MODULES([LIBVA], [libva = 0.31.1 x11-xcb xcb-dri2 >= 1.8]) - AC_MSG_WARN([vaapi state tracker currently unmaintained]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS va" - HAVE_ST_VA="yes" -fi - dnl dnl OpenCL configuration dnl @@ -1531,12 +1508,7 @@ for plat in $egl_platforms; do ;; x11) - PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes]) - # workaround a bug in xcb-dri2 generated by xcb-proto 1.6 - save_LIBS="$LIBS" - AC_CHECK_LIB(xcb-dri2, xcb_dri2_connect_alignment_pad, [], - [DEFINES="$DEFINES -DXCB_DRI2_CONNECT_DEVICE_NAME_BROKEN"]) - LIBS="$save_LIBS" + PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 >= 1.8 xcb-xfixes]) ;; drm) @@ -1714,14 +1686,6 @@ AC_ARG_WITH([vdpau-libdir], [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau']) AC_SUBST([VDPAU_LIB_INSTALL_DIR]) -dnl Directory for VA libs -AC_ARG_WITH([va-libdir], - [AS_HELP_STRING([--with-va-libdir=DIR], - [directory for the VA libraries @<:@default=${libdir}/va@:>@])], - [VA_LIB_INSTALL_DIR="$withval"], - [VA_LIB_INSTALL_DIR='${libdir}/va']) -AC_SUBST([VA_LIB_INSTALL_DIR]) - dnl Directory for OpenCL libs AC_ARG_WITH([opencl-libdir], [AS_HELP_STRING([--with-opencl-libdir=DIR], @@ -1736,7 +1700,7 @@ dnl gallium_check_st() { if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes || test "x$HAVE_ST_XA" = xyes || test "x$HAVE_ST_XVMC" = xyes || - test "x$HAVE_ST_VDPAU" = xyes || test "x$HAVE_ST_VA" = xyes; then + test "x$HAVE_ST_VDPAU" = xyes; then if test "x$have_libdrm" != xyes; then AC_MSG_ERROR([DRI or Xorg DDX requires libdrm >= $LIBDRM_REQUIRED]) fi @@ -1757,9 +1721,6 @@ gallium_check_st() { if test "x$HAVE_ST_VDPAU" = xyes && test "x$6" != x; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $6" fi - if test "x$HAVE_ST_VA" = xyes && test "x$7" != x; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $7" - fi } gallium_require_llvm() { @@ -1819,7 +1780,7 @@ if test "x$with_gallium_drivers" != x; then PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) gallium_require_llvm "Gallium R300" GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" - gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" "va-r300" + gallium_check_st "radeon/drm" "dri-r300" "xorg-r300" "" "xvmc-r300" "vdpau-r300" ;; xr600) PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) @@ -1835,7 +1796,7 @@ if test "x$with_gallium_drivers" != x; then if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs bitreader asmparser`" fi - gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600" + gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" ;; xradeonsi) PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) @@ -1866,12 +1827,8 @@ if test "x$with_gallium_drivers" != x; then if test "x$HAVE_ST_XVMC" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS xvmc-softpipe" fi - if test "x$HAVE_ST_VA" = xyes; then - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS va-softpipe" - fi if test "x$HAVE_ST_VDPAU" = xyes || - test "x$HAVE_ST_XVMC" = xyes || - test "x$HAVE_ST_VA" = xyes; then + test "x$HAVE_ST_XVMC" = xyes; then if test "x$HAVE_WINSYS_XLIB" != xyes; then GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib" fi diff --git a/mesalib/docs/faq.html b/mesalib/docs/faq.html index dd4e7de0d..97c59d381 100644 --- a/mesalib/docs/faq.html +++ b/mesalib/docs/faq.html @@ -16,7 +16,7 @@ <center> <h1>Mesa Frequently Asked Questions</h1> -Last updated: 20 September 2012 +Last updated: 9 October 2012 </center> <br> @@ -236,15 +236,22 @@ Basically you'll want the following: Mesa version number. </li></ul> <p> -After installing X.org and the DRI drivers, some of these files -may be symlinks into the /usr/X11R6/ tree. +When configuring Mesa, there are three autoconf options that affect the install +location that you should take care with: <code>--prefix</code>, +<code>--libdir</code>, and <code>--with-dri-driverdir</code>. To install Mesa +into the system location where it will be available for all programs to use, set +<code>--prefix=/usr</code>. Set <code>--libdir</code> to where your Linux +distribution installs system libraries, usually either <code>/usr/lib</code> or +<code>/usr/lib64</code>. Set <code>--with-dri-driverdir</code> to the directory +where your Linux distribution installs DRI drivers. To find your system's DRI +driver directory, try executing <code>find /usr -type d -name dri</code>. For +example, if the <code>find</code> command listed <code>/usr/lib64/dri</code>, +then set <code>--with-dri-driverdir=/usr/lib64/dri</code>. </p> <p> -The old-style Makefile system doesn't install the Mesa libraries; it's -up to you to copy them (and the headers) to the right place. -</p> -<p> -The GLUT header and library should go in the same directories. +After determining the correct values for the install location, configure Mesa +with <code>./configure --prefix=/usr --libdir=xxx --with-dri-driverdir=xxx</code> +and then install with <code>sudo make install</code>. </p> <br> <br> @@ -254,22 +261,20 @@ The GLUT header and library should go in the same directories. <h2>3.1 Rendering is slow / why isn't my graphics hardware being used?</h2> <p> -Stand-alone Mesa (downloaded as MesaLib-x.y.z.tar.gz) doesn't have any -support for hardware acceleration (with the exception of the 3DFX Voodoo -driver). -</p> -<p> -What you really want is a DRI or NVIDIA (or another vendor's OpenGL) driver -for your particular hardware. +If Mesa can't use its hardware accelerated drivers it falls back on one of its software renderers. +(eg. classic swrast, softpipe or llvmpipe) </p> <p> You can run the <code>glxinfo</code> program to learn about your OpenGL library. -Look for the GL_VENDOR and GL_RENDERER values. -That will identify who's OpenGL library you're using and what sort of +Look for the <code>OpenGL vendor</code> and <code>OpenGL renderer</code> values. +That will identify who's OpenGL library with which driver you're using and what sort of hardware it has detected. </p> <p> +If you're using a hardware accelerated driver you want <code>direct rendering: Yes</code>. +</p> +<p> If your DRI-based driver isn't working, go to the <a href="http://dri.freedesktop.org/">DRI website</a> for trouble-shooting information. </p> @@ -365,8 +370,8 @@ target hardware/operating system. <p> The best way to get started is to use an existing driver as your starting point. -For a software driver, the X11 and OSMesa drivers are good examples. -For a hardware driver, the Radeon and R200 DRI drivers are good examples. +For a classic hardware driver, the i965 driver is a good example. +For a Gallium3D hardware driver, the r300g, r600g and the i915g are good examples. </p> <p>The DRI website has more information about writing hardware drivers. The process isn't well document because the Mesa driver interface changes diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 7ebc1ea72..ac4ff8d9e 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,16 @@ <h1>News</h1> +<h2>October 8, 2012</h2> + +<p> +<a href="relnotes-9.0.html">Mesa 9.0</a> is released. +This is the first version of Mesa to support OpenGL 3.1 and GLSL 1.40 +(with the i965 driver). +See the release notes for more information about the release. +</p> + + <h2>July 10, 2012</h2> <p> diff --git a/mesalib/docs/relnotes-9.0.html b/mesalib/docs/relnotes-9.0.html index 29371b5ac..16b1417f3 100644 --- a/mesalib/docs/relnotes-9.0.html +++ b/mesalib/docs/relnotes-9.0.html @@ -14,7 +14,7 @@ <iframe src="contents.html"></iframe> <div class="content"> -<h1>Mesa 9.0 Release Notes / date TBD</h1> +<h1>Mesa 9.0 Release Notes / October 8, 2012</h1> <p> Mesa 9.0 is a new development release. @@ -33,7 +33,9 @@ because GL_ARB_compatibility is not supported. <h2>MD5 checksums</h2> <pre> -tbd +be4cd34c6599a7cb9d254b05c48bdb1f MesaLib-9.0.tar.gz +60e557ce407be3732711da484ab3db6c MesaLib-9.0.tar.bz2 +16b128544cd3f7e237927bb9f8aab7ce MesaLib-9.0.zip </pre> diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py index 0e4b420fd..2cb0cf4ef 100644 --- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py @@ -169,11 +169,9 @@ class PrintGlxProtoStubs(glX_proto_common.glx_print_proto): print '#include "glapi.h"' print '#include "glthread.h"' print '#include <GL/glxproto.h>' - print '#ifdef USE_XCB' print '#include <X11/Xlib-xcb.h>' print '#include <xcb/xcb.h>' print '#include <xcb/glx.h>' - print '#endif /* USE_XCB */' print '' print '#define __GLX_PAD(n) (((n) + 3) & ~3)' diff --git a/mesalib/src/mesa/main/texcompress_cpal.c b/mesalib/src/mesa/main/texcompress_cpal.c index 4aa1f610e..75389a437 100644 --- a/mesalib/src/mesa/main/texcompress_cpal.c +++ b/mesalib/src/mesa/main/texcompress_cpal.c @@ -140,21 +140,6 @@ _mesa_cpal_compressed_size(int level, GLenum internalFormat, return expect_size; } -void -_mesa_cpal_compressed_format_type(GLenum internalFormat, GLenum *format, - GLenum *type) -{ - const struct cpal_format_info *info; - - if (internalFormat < GL_PALETTE4_RGB8_OES - || internalFormat > GL_PALETTE8_RGB5_A1_OES) { - return; - } - - info = &formats[internalFormat - GL_PALETTE4_RGB8_OES]; - *format = info->format; - *type = info->type; -} /** * Convert a call to glCompressedTexImage2D() where internalFormat is a diff --git a/mesalib/src/mesa/main/texcompress_cpal.h b/mesalib/src/mesa/main/texcompress_cpal.h index 7507d5c1b..7d28fd866 100644 --- a/mesalib/src/mesa/main/texcompress_cpal.h +++ b/mesalib/src/mesa/main/texcompress_cpal.h @@ -38,8 +38,5 @@ extern unsigned _mesa_cpal_compressed_size(int level, GLenum internalFormat, unsigned width, unsigned height); -extern void -_mesa_cpal_compressed_format_type(GLenum internalFormat, GLenum *format, - GLenum *type); #endif /* TEXCOMPRESS_CPAL_H */ diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index d7156e670..6c8bb85b8 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -1977,10 +1977,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions, case GL_PALETTE8_R5_G6_B5_OES: case GL_PALETTE8_RGBA4_OES: case GL_PALETTE8_RGB5_A1_OES: - _mesa_cpal_compressed_format_type(internalFormat, &choose_format, - &choose_type); - proxy_format = choose_format; - /* check level (note that level should be zero or less!) */ if (level > 0 || level < -maxLevels) { reason = "level"; diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index dd9dce7bb..4f9a762bb 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -1596,13 +1596,10 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd) { GrabPtr grab = keybd->deviceGrab.grab; DeviceIntPtr dev; - WindowPtr focusWin = keybd->focus ? keybd->focus->win - : keybd->spriteInfo->sprite->win; + WindowPtr focusWin; Bool wasImplicit = (keybd->deviceGrab.fromPassiveGrab && keybd->deviceGrab.implicitGrab); - if (focusWin == FollowKeyboardWin) - focusWin = inputInfo.keyboard->focus->win; if (keybd->valuator) keybd->valuator->motionHintWindow = NullWindow; keybd->deviceGrab.grab = NullGrab; @@ -1613,6 +1610,17 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd) if (dev->deviceGrab.sync.other == grab) dev->deviceGrab.sync.other = NullGrab; } + + if (keybd->focus) + focusWin = keybd->focus->win; + else if (keybd->spriteInfo->sprite) + focusWin = keybd->spriteInfo->sprite->win; + else + focusWin = NullWindow; + + if (focusWin == FollowKeyboardWin) + focusWin = inputInfo.keyboard->focus->win; + DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab); if (!wasImplicit && grab->grabtype == XI2) diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c index 8a959a39c..76e170ec5 100644 --- a/xorg-server/os/osinit.c +++ b/xorg-server/os/osinit.c @@ -129,7 +129,7 @@ OsSigHandler(int signo) #ifdef SA_SIGINFO if (sip->si_code == SI_USER) { - ErrorFSigSafe("Recieved signal %u sent by process %u, uid %u\n", signo, + ErrorFSigSafe("Received signal %u sent by process %u, uid %u\n", signo, sip->si_pid, sip->si_uid); } else { |