mesa: Changes to 'master'

Fri Oct 12 23:36:11 UTC 2007

 include/GL/internal/dri_interface.h            |  420 ++++++++-----------
 src/glx/x11/Makefile                           |    3 
 src/glx/x11/XF86dri.c                          |   39 +
 src/glx/x11/dri_glx.c                          |    5 
 src/glx/x11/glxclient.h                        |   61 ++
 src/glx/x11/glxcmds.c                          |  352 +++++++---------
 src/glx/x11/glxext.c                           |  192 +++++---
 src/glx/x11/glxextensions.c                    |   77 ++-
 src/glx/x11/glxextensions.h                    |    6 
 src/glx/x11/glxhash.c                          |  411 +++++++++++++++++++
 src/glx/x11/glxhash.h                          |   16 
 src/glx/x11/xf86dri.h                          |   12 
 src/glx/x11/xf86dristr.h                       |    5 
 src/mesa/drivers/dri/common/dri_util.c         |  539 ++++++-------------------
 src/mesa/drivers/dri/common/dri_util.h         |   99 +---
 src/mesa/drivers/dri/common/vblank.c           |   10 
 src/mesa/drivers/dri/ffb/ffb_xmesa.c           |   48 --
 src/mesa/drivers/dri/i810/i810screen.c         |   51 --
 src/mesa/drivers/dri/i915/intel_buffers.c      |    4 
 src/mesa/drivers/dri/i915/intel_context.c      |    2 
 src/mesa/drivers/dri/i915/intel_screen.c       |  109 +----
 src/mesa/drivers/dri/i965/intel_screen.c       |  101 +---
 src/mesa/drivers/dri/mach64/mach64_screen.c    |   92 +---
 src/mesa/drivers/dri/mach64/mach64_screen.h    |    2 
 src/mesa/drivers/dri/mga/mga_xmesa.c           |  107 +---
 src/mesa/drivers/dri/mga/mgaioctl.c            |    4 
 src/mesa/drivers/dri/mga/mgastate.c            |    5 
 src/mesa/drivers/dri/nouveau/nouveau_screen.c  |   96 +---
 src/mesa/drivers/dri/r128/r128_context.c       |    2 
 src/mesa/drivers/dri/r128/r128_screen.c        |  101 +---
 src/mesa/drivers/dri/r128/r128_screen.h        |    2 
 src/mesa/drivers/dri/r200/r200_context.c       |    8 
 src/mesa/drivers/dri/r200/r200_ioctl.c         |    6 
 src/mesa/drivers/dri/r200/r200_ioctl.h         |    6 
 src/mesa/drivers/dri/r300/radeon_context.c     |    2 
 src/mesa/drivers/dri/radeon/radeon_context.c   |    8 
 src/mesa/drivers/dri/radeon/radeon_screen.c    |  174 +++-----
 src/mesa/drivers/dri/radeon/radeon_screen.h    |    2 
 src/mesa/drivers/dri/s3v/s3v_xmesa.c           |    4 
 src/mesa/drivers/dri/savage/savage_xmesa.c     |   94 +---
 src/mesa/drivers/dri/savage/savagetex.c        |    4 
 src/mesa/drivers/dri/sis/sis_screen.c          |   73 +--
 src/mesa/drivers/dri/tdfx/tdfx_screen.c        |   97 +---
 src/mesa/drivers/dri/trident/trident_context.c |   52 +-
 src/mesa/drivers/dri/unichrome/via_context.c   |    3 
 src/mesa/drivers/dri/unichrome/via_context.h   |    1 
 src/mesa/drivers/dri/unichrome/via_screen.c    |   99 +---
 src/mesa/drivers/dri/unichrome/via_screen.h    |    2 
 48 files changed, 1790 insertions(+), 1818 deletions(-)

commit diffs at http://gitweb.freedesktop.org/?p=mesa/mesa.git;a=summary

New commits:
commit f9c6dfc4d12451c21f39f38b048758cbee5723cf
Merge: bf805d3... a249446...
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Fri Oct 12 19:35:04 2007 -0400

    Merge branch 'dri2'
    
    Conflicts:
    
    	src/mesa/drivers/dri/i915/intel_screen.c

commit a2494462cb7d557a7643452c720e0ab8fa9f4f63
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Thu Oct 11 12:49:26 2007 -0400

    Drop no longer implemented MESA allocate extension from i915.

commit ccff0cb26378ce370fc8697a2a2ada138d2e119e
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Thu Jun 7 19:35:54 2007 -0400

    Add a version field to __DRIextension.

commit f29f0ae8383888a6493b615edc3bab254cf6df39
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Tue May 22 12:26:02 2007 -0400

    Move new texOffset extension to the new extension mechanism.

commit ecdb45cb29e3209287cc297081596126e955ff2b
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Thu May 17 16:11:19 2007 -0400

    Convert a left-over private void * to __DRIcontext *.

commit 3eaec7dc5d9b859cd394288ba73ae7e692f26a50
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Thu May 17 15:47:47 2007 -0400

    Move enabling of DRI extensions into glxextensions.c

commit 594006d8b2960b9e49b57c02682289ae900ffc71
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Thu May 17 15:33:14 2007 -0400

    Remove now unused getProcAddress from DRIinterfaceMethods.

commit f968f67e6214416f04b8875ce59a94a02f464c81
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Thu May 17 14:39:06 2007 -0400

    Add a DRI_ReadDrawable marker extension to signal read drawable capability.

commit 106a6f29bbdc71982afd629bdf89369cefd1459e
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Wed May 16 18:13:41 2007 -0400

    Move media stream counter entry points to new extension.

commit a7a0a2beb54dcb78d7e0ab64cf2f5a6ede8191a4
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Wed May 16 15:50:40 2007 -0400

    Move GLX_MESA_swap_frame_usage DRI entry points to the new mechanism.

commit 78a6aa57a0155d72280dd91c05513c847bf76f3b
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Wed May 16 14:10:29 2007 -0400

    Move GLX_MESA_allocate_memory related functions to new extension mechanism.

commit efaf90b03e8b69e04909bce071f8ef6b65cc0e9d
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Tue May 15 16:09:44 2007 -0400

    Move swap_interval to new extension mechanism.

commit ac3e838fa748c8c8a6ffc04d1ab13da71f75f103
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Tue May 15 15:17:30 2007 -0400

    Move the copySubBuffer extension over to the new mechanism.

commit f616a263a25eda135800bea7d3a863c569b93e30
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Tue May 15 12:31:31 2007 -0400

    Implement new screen extension API.
    
    This new API lets the loader examine DRI level extensions provided by the
    driver in a forward compatible manner.
    
    Much of the churn in the DRI interface is adding support for new
    extensions or removing old, unused extensions.  This new extension
    mechanism lets the loader query the extensions provided by the driver
    and implement the extensions it knows about.  Deprecating extensions
    is done by not exporting that extension in the list, which doesn't
    require keeping old function pointers around to preserve ABI.

commit 295dc2d225ccac1951c0fcc2c08119f31d1b575c
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Mon May 14 17:07:16 2007 -0400

    Stop passing in unused fbconfigs to createNewScreen.

commit 64106d0d9aeefa6974317042b6bc3e5eaabac5a2
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Mon May 14 16:58:37 2007 -0400

    Pull createNewScreen entry point into dri_util.c.
    
    This pulls the top level createNewScreen entry point out of the drivers
    and rewrites __driUtilCreateNewScreen in dri_util.c to be the new entry point.
    
    The change moves more logic into the common/ layer and changes the
    createNewScreen entry point to only be defined in one place.

commit efd03a278ae55b454509e9659c42899133983ebd
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Mon May 14 16:37:19 2007 -0400

    Replace open-coded major, minor, and patch version fields with __DRIversionRec.

commit 5987a03f994af2bb413d1cf984ab01aa095c0943
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Fri May 11 16:43:20 2007 -0400

    Convert all DRI entrypoints to take pointers to __DRI* types.
    
    The entrypoints take a mix of __DRIscreen * and void * (screen private)
    arguments (similarly for contexts and drawables).  This patch does away
    with passing the private void pointer and always only passes the fully
    typed __DRIscreen pointer and always as the first argument.
    
    This makes the interface more consistent and increases type safety, and
    catches a bug where we would pass a screen private to DRIdrawable::getSBC.

commit aac367f48afc62176faf67aa6f329fbeae2004b4
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Fri May 11 16:11:23 2007 -0400

    Remove screenConfigs from __DRIscreen.
    
    The screenConfigs field of __DRIscreen points back to the containing
    __GLXscreenConfigs struct.  This is a serious abstraction violation; it
    assumes that the loader is libGL and that there *is* a __GLXscreenConfigs
    type in the loader.
    
    Using the containerOf macro, we can get from the __DRIscreen pointer to
    the containing __GLXscreenConfigs struct, at a place in the stack
    where the above is a valid assumption.  Besides, the __DRI* structs shouldn't
    hold state other than the private pointer.

commit fa72013adaab4d0755e852805e2e44d1a879a204
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Fri May 11 13:54:44 2007 -0400

    Drop mostly unused __DRIid typedef.

commit 9590ba97ad6606a96b50a66242f606c860ca239d
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Fri May 11 13:24:34 2007 -0400

    Avoid deadlock in GarbageCollectDRIDrawables.
    
    __glXinitialize() can't be called with the GLX lock held.  Just
    pass in the __GLXscreenConfigs pointer so we don't have to look it
    up in __GLXdisplayPrivate.

commit 8ed5c7ca0572a09375bdfd411c3804456dac78d6
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Thu May 10 18:38:49 2007 -0400

    Drop createContext and destroyContext from DRIinterfaceMethods.
    
    As for createDrawable and destroyDrawable, these functions immediately
    upon entry to driCreateNewContext and immediately before exit from
    driDestroyContext.  Instead of passing function pointers back and forth
    just obtain the drm_context_t prior to calling DRIscreen::createNewContext
    and pass it as a parameter.
    
    This change also lets us keep the DRI context XID in the libGL loader only.

commit 4ff95e78e19e5902352ea3759d32d9f013255f42
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Thu May 10 17:14:38 2007 -0400

    Drop createDrawable and destroyDrawable fron DRIinterfaceMethods.
    
    All the DRI driver did was call the createDrawable callback immediately
    upon entry to DRIscreen::createNewDrawable to get the drm_drawable_t.
    We can just call that before calling into the DRI driver and pass the
    returned drm_drawable_t as an argument to the DRI entry point.
    
    Likewise for destroyDrawable.
    
    Also, DRIdrawablePrivate::draw isn't used anywhere, and since the
    driver no longer needs the XID of the drawable we can now drop that.

commit b068af2f3b890bec26a186e9d0bdd3d44c17cd4d
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Wed Oct 10 17:07:01 2007 -0400

    Key drm_i915_flip_t typedef off of the ioctl #define instead.

commit aceccda56b08338e217991e54607f1c9f18fc3e6
Author: Kristian HÃ¸gsberg <krh at hinata.boston.redhat.com>
Date:   Thu May 10 15:52:22 2007 -0400

    Drop __DRInativeDisplay and pass in __DRIscreen pointers instead.
    
    Many DRI entry points took a __DRInativeDisplay pointer and a screen
    index as arguments.  The only use for the native display pointer was to
    pass it back to the loader when looking up the __DRIscreen for the given
    screen index.
    
    Instead, let's just pass in the __DRIscreen pointer directly, which
    let's drop the __DRInativeDisplay type and the getScreen function.
    
    The assumption is now that the loader will be able to retrieve context
    from the __DRIscreen pointer when necessary.

commit b42152061c50e870dc2698ea1d860980ce1198b1
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Mon Apr 30 21:05:10 2007 -0400

    Add macros to generate CreateNewScreen entrypoint.

commit 4a22ae8d446855d839cc199df8eb1b057045cb88
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Sun Jan 7 08:12:01 2007 -0500

    Remove XIDs from DRI interface (see #5714).

commit 4ceefccbfa180d19e27716bf7f282d0438ac34bd
Author: Kristian HÃ¸gsberg <krh at redhat.com>
Date:   Sun Apr 29 15:05:02 2007 -0400

    Pull in the drm hash.