1. 29 Dec, 2011 1 commit
  2. 10 Nov, 2011 1 commit
  3. 11 Mar, 2011 1 commit
    • Marek Olšák's avatar
      gallium: remove flags from the flush function · 7e023034
      Marek Olšák authored
      The drivers have been changed so that they behave as if all of the flags
      were set. This is already implicit in most hardware drivers and required
      for multiple contexts.
      
      Some state trackers were also abusing the PIPE_FLUSH_RENDER_CACHE flag
      to decide whether flush_frontbuffer should be called.
      New flag ST_FLUSH_FRONT has been added to st_api.h as a replacement.
      7e023034
  4. 06 Jan, 2011 1 commit
  5. 30 Nov, 2010 1 commit
    • Brian Paul's avatar
      gallivm/llvmpipe: squash merge of the llvm-context branch · efc82aef
      Brian Paul authored
      This branch defines a gallivm_state structure which contains the
      LLVMBuilderRef, LLVMContextRef, etc.  All data structures built with
      this object can be periodically freed during a "garbage collection"
      operation.
      
      The gallivm_state object has to be passed to most of the builder
      functions where LLVMBuilderRef used to be used.
      
      Conflicts:
      	src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
      	src/gallium/drivers/llvmpipe/lp_state_setup.c
      efc82aef
  6. 18 Sep, 2010 1 commit
  7. 27 Aug, 2010 3 commits
  8. 25 Aug, 2010 1 commit
  9. 06 Aug, 2010 2 commits
  10. 22 Jun, 2010 1 commit
  11. 18 Jun, 2010 1 commit
    • Roland Scheidegger's avatar
      llvmpipe: limit the number of fragment shader variants kept around · 17c9d7ee
      Roland Scheidegger authored
      llvmpipe can create a large number of shader variants for a single shader
      (which are quite big), and they were only ever deleted if the shader itself
      was deleted. This is especially apparent in things like glean
      blendFunc where a new variant is created for every different subtest, chewing
      up all memory.
      This change limits the numbers of fragment shader variants (for all shaders)
      which are kept around to a fixed number. If that would be exceeded a fixed
      portion of the cached variants is deleted (since without tracking the used
      variants this involves flushing we don't want to delete only one).
      Always the least recently used variants (from all shaders together) are
      deleted.
      For now this is all per-context.
      Both the number of how many variants are cached (1024) as well as how many
      will be deleted at once (1/4 of the cache size) are just rough guesses and
      subject to further optimization.
      17c9d7ee
  12. 07 Jun, 2010 1 commit
  13. 28 Apr, 2010 8 commits
  14. 19 Apr, 2010 3 commits
  15. 16 Apr, 2010 2 commits
    • Brian Paul's avatar
      ce4f4d6b
    • Brian Paul's avatar
      Merge the lp-surface-tiling branch into master. · 0639765b
      Brian Paul authored
      This branch implemented dual representations of texture/drawing surfaces:
      one in the conventional linear layout and the other the tiled layout which
      is used by the fragment shader pipe.  Per-tile flags indicate the layout
      of each image tile.  In many situations this lets us avoid converting
      image data between the two layouts.
      
      Squashed commit of the following:
      
      commit 563a7e3cc552fdcfcaf9ac0d4b1683c3ba2ae732
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Apr 8 14:48:21 2010 -0600
      
          llvmpipe: convert points/lines to triangles with draw module
      
          This isn't the most efficient way to render points/lines but it allows us
          to run more tests.
      
      commit a8aa763e8a717533f2b13bb6ea53cbccbede68c9
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Apr 8 14:47:28 2010 -0600
      
          llvmpipe: call llvmpipe_get_texture_tile() for depth/stencil
      
          The returned pointer isn't used, but the tile status/layout info
          gets updated.  Helps to fix glReadPixels(DEPTH / STENCIL).
      
      commit 463bc64af266194acbea71cd52e26a79b8c8a260
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Apr 8 10:58:48 2010 -0600
      
          llvmpipe: add store_color to debug cmd_names list
      
      commit 784cc73fb334a9d7b7c93cbd8a1445cdf742ff58
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Apr 8 10:57:43 2010 -0600
      
          llvmpipe: fix debug build
      
      commit 792c93171ec075664f55720ffed397ac2834a4fc
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Apr 8 10:49:01 2010 -0600
      
          llvmpipe: fix cube mapping
      
      commit 882b1035db88c3dd8aebe28dc971ac30a9ee39e3
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Apr 8 09:53:30 2010 -0600
      
          llvmpipe: remove some older/unused code
      
      commit b807d32b23145301e8842824664d9f06b9c5502e
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Apr 8 09:29:50 2010 -0600
      
          llvmpipe: silence warning
      
      commit 7b337e64fec92836ccdf9d96216289dd58418e35
      Author: Brian Paul <brianp@vmware.com>
      Date:   Wed Apr 7 17:06:08 2010 -0600
      
          llvmpipe: clean-up, comments in lp_surface_copy()
      
      commit c52fa36f249cc652fa8d5fdd94d6574127c08c41
      Author: Brian Paul <brianp@vmware.com>
      Date:   Wed Apr 7 16:51:42 2010 -0600
      
          llvmpipe: overhaul tiled/linear memory management
      
          Now we keep per-tile layout info (linear vs. tiled (or neither or both)
          and convert from one layout to the other on demand.
      
      commit 4a50ccfd470547c9be0704005818a87014e9c0e9
      Author: Brian Paul <brianp@vmware.com>
      Date:   Wed Apr 7 16:51:27 2010 -0600
      
          llvmpipe: added tile read/write counters
      
      commit b7d0ea9c687ac8773b083791623826fa604adf21
      Author: Brian Paul <brianp@vmware.com>
      Date:   Mon Apr 5 14:54:04 2010 -0600
      
          llvmpipe: rename some functions
      
      commit ee45c6e5b95cbd3c8cccc9aa4d45d8aef11e20c4
      Author: Brian Paul <brianp@vmware.com>
      Date:   Mon Apr 5 14:42:15 2010 -0600
      
          llvmpipe: re-org some get block/tile pointer code
      
      commit 26ce97c16c0b6520ff1538803baa772d8c3b1280
      Author: Brian Paul <brianp@vmware.com>
      Date:   Mon Apr 5 14:34:13 2010 -0600
      
          llvmpipe: disable bad assertions
      
      commit 5c670481248c4d46f87f13bf3af5655925e7002d
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Apr 2 16:36:11 2010 -0600
      
          llvmpipe: add a special-case optimization to lp_surface_copy()
      
          Be more efficient when copying tiled image to linear image.
          Before, the fallback path was always converting the whole source image
          to linear.  Now we can convert just a sub region.
      
      commit faa684645e64d6024b3a11e4e08da825e8220b2e
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Apr 2 16:15:16 2010 -0600
      
          llvmpipe: assorted texture and tile/line conversion code change s
      
          The tiled/linear conversion functions take x/y positions now to
          allow converting only sub-regions.
      
          More texture-related helper functions.
      
      commit baad81ec5318d44bfac1e37c7643afc0836607bb
      Author: Brian Paul <brianp@vmware.com>
      Date:   Tue Mar 30 13:18:40 2010 -0600
      
          llvmpipe: convert tiled->linear upon PIPE_FLUSH_SWAPBUFFERS
      
          If we know we're about to do a swapbuffers we should immediately
          convert the tiled color tiles to linear instead of later in
          llvmpipe_texture_unmap() since we can take advantage of threading/
          parallelism here.
      
      commit 928dd41256811daeddb7506a49a34dbad04beaf8
      Author: Brian Paul <brianp@vmware.com>
      Date:   Tue Mar 30 09:16:58 2010 -0600
      
          llvmpipe: polish-up the llvmpipe_flush() code
      
      commit dd6014abcf86c517d159b8175e0eaeb167ea2ef6
      Author: Brian Paul <brianp@vmware.com>
      Date:   Tue Mar 30 09:15:17 2010 -0600
      
          llvmpipe: SETUP_x enum clean-up
      
      commit 0b1ce6da2b28a41f3389685ab93e10b43c950f5d
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Mar 26 10:43:37 2010 -0600
      
          llvmpipe: remove unused vars
      
      commit 4562663480f88162ed4452cb05569eecb67f9f39
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Mar 26 10:31:55 2010 -0600
      
          llvmpipe: cope with non-existant color/depth buffers
      
          The fragment jit functions always grab these pointers, even if they're
          not used.
      
      commit df4329edbaf204ed501f1eac0698b8198178f9af
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Mar 25 15:20:15 2010 -0600
      
          llvmpipe: do all render target surface mapping/unmapping in the rast code
      
      commit 3d0c25d5ba8b8f61e8366d4c97324e45d526ff41
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Mar 25 14:31:21 2010 -0600
      
          llvmpipe: map z/stencil buffer on demand like color buffers
      
          Plus lots of code clean-up and loose ends taken care of.
      
      commit c3b6fddd788aef09b4b84b843b7b1272231151e8
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Mar 25 13:15:03 2010 -0600
      
          llvmpipe: remove unused write_zstencil field
      
      commit 63374d97836926a6357e9d6dd24a509a8e155c56
      Author: Brian Paul <brianp@vmware.com>
      Date:   Thu Mar 25 09:45:59 2010 -0600
      
          llvmpipe: add missing lp_rast_end() call
      
          Fixes crash on window resize when LP_NUM_THREADS=0.
      
      commit 92fe9952161cc06f6edc58778e9e5a8b9ea447dc
      Author: Brian Paul <brianp@vmware.com>
      Date:   Wed Mar 24 10:15:19 2010 -0600
      
          llvmpipe: add tiled/linear conversion for 16-bit Z images
      
      commit 6605fa28c147f30df351da0e4413cab33e4db5da
      Author: Brian Paul <brianp@vmware.com>
      Date:   Tue Mar 23 16:06:41 2010 -0600
      
          llvmpipe: implement tiled/linear conversion for Z/stencil images
      
      commit 804528d84ffa292ef9d49d3666cdd3fa099ff3ff
      Author: Brian Paul <brianp@vmware.com>
      Date:   Tue Mar 23 16:05:45 2010 -0600
      
          llvmpipe: added texture stride comment
      
      commit 66a88c012edf670c4ac887a912f02dcff93266dd
      Author: Brian Paul <brianp@vmware.com>
      Date:   Tue Mar 23 16:04:07 2010 -0600
      
          llvmpipe: remove unused vars
      
      commit e2ca8d1328316dc8b36d5f688c16d109e49a6870
      Author: Brian Paul <brianp@vmware.com>
      Date:   Mon Mar 22 18:53:11 2010 -0600
      
          llvmpipe: checkpoint WIP: overhaul texture/surface mapping
      
          Conversion between tiled and linear surfaces is working everywhere now.
          The LP_TEXTURE_READ/READ_WRITE/WRITE_ALL flags let us avoid unnecessary
          image layout conversions.
      
          Still some loose ends, temporary/debug code, etc.
          Need to implement tiled/linear conversion for depth/stencil images.
      
      commit f2730a03839ee8984c1f537b7cbebba24961397a
      Author: Brian Paul <brianp@vmware.com>
      Date:   Mon Mar 22 14:41:58 2010 -0600
      
          llvmpipe: rename/repurpose lp_rast_store_color()
      
      commit e192a47552c5d20d2caef452ca7697e2cd852c9b
      Author: Brian Paul <brianp@vmware.com>
      Date:   Mon Mar 22 14:38:51 2010 -0600
      
          llvmpipe: remove lp_rast_load_color()
      
      commit 3cff0bde4b4ab980e1c3e812700419091527c76b
      Author: Brian Paul <brianp@vmware.com>
      Date:   Mon Mar 22 14:11:38 2010 -0600
      
          llvmpipe: remove/consolidate texture image code
      
      commit 3a2f08b6a550c69ef5e874f482be30252cbf8bfa
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Mar 19 17:03:14 2010 -0600
      
          llvmpipe: checkpoint WIP: directly render to tiled texture buffers
      
          We're now directly writing colors into the tiled texture image buffers.
      
          This is a checkpoint commit with lots of dead code and temporary hacks.
          Everything will get cleaned up eventually.
      
      commit c5ca987e03870849514d4e3c99af143722a09695
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Mar 19 16:41:14 2010 -0600
      
          llvmpipe: refactor code, create tile_pixel_offset()
      
      commit 2133e8273e937cbac09cd7264d6ce53af9764ddb
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Mar 19 14:55:11 2010 -0600
      
          llvmpipe: pass LP_TEXTURE_LINEAR/TILED flags around
      
      commit b9b9d4b82b01f4588721fdc8444740f859b4a021
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Mar 19 14:51:05 2010 -0600
      
          llvmpipe: checkpoint WIP: hanlde co-existing tiled/linear texture data
      
          Cube maps are temporarily broken, maybe other things.
      
      commit 4cd322e6889940b5f155fcb69041b685b9ef9273
      Author: Brian Paul <brianp@vmware.com>
      Date:   Fri Mar 19 11:34:43 2010 -0600
      
          progs/demos: add other modes/patterns to dissolve demo
      0639765b
  16. 10 Apr, 2010 1 commit
    • Keith Whitwell's avatar
      Squashed commit of the following: · 287c94ea
      Keith Whitwell authored
      commit 0189cb2f
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Apr 10 12:48:43 2010 +0100
      
          gallium: don't use generic get_transfer func for textures
      
          It doesn't know and can't fill in the stride value.
      
      commit 65bc6f88
      Author: Chia-I Wu <olv@lunarg.com>
      Date:   Sat Apr 10 13:49:34 2010 +0800
      
          i915g: Initialize screen surface function.
      
      commit eb56e649
      Merge: f8b0a7f6 e7f1e5ca
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Apr 10 00:38:43 2010 +0100
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/r300/r300_texture.c
      
      commit f8b0a7f6
      Merge: a3c99807 f43c679c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Apr 10 00:35:09 2010 +0100
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/r300/r300_texture.c
      
      commit a3c99807
      Author: unknown <michal@.(none)>
      Date:   Fri Apr 9 18:51:39 2010 +0200
      
          scons: Add missing sources.
      
      commit 927cec79
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Fri Apr 9 18:07:56 2010 +0200
      
          gallium: fix another compile warning after merge. Hmpf.
      
      commit 52953cd7
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Fri Apr 9 18:02:11 2010 +0200
      
          gallium: fix comment
      
      commit 7c8763aa
      Author: unknown <michal@.(none)>
      Date:   Fri Apr 9 18:05:20 2010 +0200
      
          util: Fix type cast.
      
      commit 9d008641
      Author: unknown <michal@.(none)>
      Date:   Fri Apr 9 18:04:33 2010 +0200
      
          libgl-gdi: Use proper unwrap functions for resources.
      
      commit 251a5cdd
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Fri Apr 9 17:51:23 2010 +0200
      
          gallium: more comments fixup
      
      commit 8f3f9d5e
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Fri Apr 9 17:48:18 2010 +0200
      
          gallium: another fix after merge
      
      commit 41f00a32
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Fri Apr 9 17:44:30 2010 +0200
      
          gallium: more pipe_texture/resource fixes after merge
      
      commit faf53328
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Fri Apr 9 17:44:24 2010 +0200
      
          gallium: fix comments for changed USAGE flags
      
      commit fdcb17be
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Fri Apr 9 16:40:07 2010 +0200
      
          gallium/pb: pb uses PB_USAGE_ flags, not PIPE_TRANSFER_ (same value anyway)
      
      commit c95f7278
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Apr 9 13:44:35 2010 +0100
      
          llvmpipe: fix merge glitches
      
      commit 28f8b868
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Apr 9 13:41:39 2010 +0100
      
          r300g: update after merge for pipe_resources
      
      commit 248c93cb
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Apr 9 13:41:20 2010 +0100
      
          st/mesa: fix old pipe_texture usages
      
      commit a563b1c5
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Apr 9 13:40:56 2010 +0100
      
          r300g: remove unused variable
      
      commit 73450013
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Apr 9 13:40:36 2010 +0100
      
          nv50: fix compiler warning
      
      commit efd402e1
      Merge: fec8a1db 54526154
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Apr 9 13:33:57 2010 +0100
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/cell/ppu/cell_screen.c
          	src/gallium/drivers/cell/ppu/cell_texture.c
          	src/gallium/drivers/llvmpipe/lp_screen.c
          	src/gallium/drivers/r300/r300_context.c
          	src/gallium/drivers/r300/r300_render.c
          	src/gallium/drivers/r300/r300_screen.c
          	src/gallium/drivers/r300/r300_state.c
          	src/gallium/drivers/r300/r300_texture.c
          	src/gallium/drivers/r300/r300_transfer.c
          	src/gallium/state_trackers/egl/common/egl_g3d.h
          	src/gallium/state_trackers/egl/kms/native_kms.c
          	src/gallium/state_trackers/egl/x11/native_dri2.c
          	src/gallium/state_trackers/egl/x11/native_ximage.c
      
      commit fec8a1db
      Author: Marek Olšák <maraeo@gmail.com>
      Date:   Sat Apr 3 07:58:34 2010 +0200
      
          util: fix assertion failures in pipe_buffer_flush_mapped_range
      
      commit 1ff3984c
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Thu Apr 8 17:44:54 2010 +0200
      
          docs: fix transfer_map description
      
      commit 20bf14be
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Apr 8 14:39:13 2010 +0100
      
          util: fix up several uses of pipe_map_buffer_range
      
          This function used to return a pointer to where the start of the
          actual buffer would have been, even though only the requested range is
          being mapped.
      
          In the resources change, the function was modified to use a transfer
          internally, and started returning the pointer to the beginning of the
          transfer, ie the mapped range.
      
          Some users of the function were changed to reflect this new behaviour,
          some were not.  Since then the function has reverted to its original
          behaviour, matching master.
      
          This change restores some of the users of the map_buffer_range helper
          to expect the old/original behaviour.
      
      commit 33179a86
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Apr 8 14:38:54 2010 +0100
      
          mesa/st: fix up several uses of pipe_map_buffer_range
      
          This function used to return a pointer to where the start of the
          actual buffer would have been, even though only the requested range is
          being mapped.
      
          In the resources change, the function was modified to use a transfer
          internally, and started returning the pointer to the beginning of the
          transfer, ie the mapped range.
      
          Some users of the function were changed to reflect this new behaviour,
          some were not.  Since then the function has reverted to its original
          behaviour, matching master.
      
          This change restores some of the users of the map_buffer_range helper
          to expect the old/original behaviour.
      
      commit 3f5363d4
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Wed Apr 7 17:26:52 2010 +0100
      
          util: map_range and flush_range have offsets relative to start of buffer
      
      commit 7eb1bfb9
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Wed Apr 7 17:26:08 2010 +0100
      
          nv50: fix compiler warning
      
      commit d040daff
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Wed Apr 7 17:25:58 2010 +0100
      
          nvfx: fix compiler warning
      
      commit 49ec01df
      Author: Chia-I Wu <olv@lunarg.com>
      Date:   Mon Apr 5 11:58:53 2010 +0800
      
          mesa/es: Fixes for gallium-resources.
      
      commit 47c87ada
      Author: Marek Olšák <maraeo@gmail.com>
      Date:   Sat Apr 3 05:19:20 2010 +0200
      
          r300g: fix transfers for textures created from winsys handles
      
      commit 5f2701fd
      Author: Luca Barbieri <luca@luca-barbieri.com>
      Date:   Sat Apr 3 03:52:38 2010 +0200
      
          nouveau: don't use the staging usage
      
          Maybe it could make sense, but for now dynamic is enough.
      
          None of these avoid uncached reads from GART on AGP cards.
      
      commit 0db20fa4
      Author: Luca Barbieri <luca@luca-barbieri.com>
      Date:   Sat Apr 3 03:27:19 2010 +0200
      
          i965: add brw_resource.c to Makefile
      
      commit b94f3e73
      Author: Luca Barbieri <luca@luca-barbieri.com>
      Date:   Sat Apr 3 01:48:33 2010 +0200
      
          nouveau: fix for gallium-resources
      
      commit a01ff99a
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Thu Apr 1 19:26:35 2010 +0200
      
          gallium: fix missing includes
      
      commit 26aeded5
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Thu Apr 1 19:19:18 2010 +0200
      
          gallium: remove video interface and related stuff
      
          These interfaces weren't quite was needed, and building disabled for a while.
          Some code actually build since some branch merge, and were now not fully
          converted to gallium-resources.
          See http://www.mail-archive.com/mesa3d-dev@lists.sourceforge.net/msg09619.html
          for a discussion of this. Video related work is done in origin/pipe-video
          branch.
      
      commit c64285ae
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Thu Apr 1 18:45:54 2010 +0200
      
          python: fixes for resource changes
      
          doesn't look quite ok yet, but sort of compiles.
      
      commit 03d4d5a4
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Thu Apr 1 18:34:46 2010 +0200
      
          gallium: s/u_box_orgin_2d/u_box_origin_2d
      
      commit 2444f023
      Author: Marek Olšák <maraeo@gmail.com>
      Date:   Thu Apr 1 03:26:50 2010 +0200
      
          r300g: fix segfault when the transfers functions are used
      
          Still broken.
      
      commit 6f09bf40
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Thu Apr 1 00:05:12 2010 +0200
      
          r300g: compile fixes
      
      commit 76711ff4
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Thu Apr 1 00:04:47 2010 +0200
      
          nvfx: more compile fixes
      
      commit c5d2e90c
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Wed Mar 31 23:18:50 2010 +0200
      
          gallium: more mostly merge fallout fixes...
      
      commit fbc37226
      Merge: 86d9225d d97f6963
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Wed Mar 31 22:09:35 2010 +0200
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/cell/ppu/cell_screen.c
          	src/gallium/drivers/i915/i915_buffer.c
          	src/gallium/drivers/i915/i915_context.h
          	src/gallium/drivers/i915/i915_resource_texture.c
          	src/gallium/drivers/i915/i915_screen.c
          	src/gallium/drivers/i915/i915_state_emit.c
          	src/gallium/drivers/i965/brw_resource_texture.c
          	src/gallium/drivers/llvmpipe/lp_screen.c
          	src/gallium/drivers/llvmpipe/lp_setup.c
          	src/gallium/drivers/nvfx/nv30_fragtex.c
          	src/gallium/drivers/nvfx/nv40_fragtex.c
          	src/gallium/drivers/nvfx/nvfx_miptree.c
          	src/gallium/drivers/nvfx/nvfx_screen.c
          	src/gallium/drivers/nvfx/nvfx_transfer.c
          	src/gallium/drivers/r300/r300_state.c
          	src/gallium/drivers/svga/svga_screen_texture.c
          	src/gallium/state_trackers/dri/common/dri_drawable.c
          	src/gallium/state_trackers/dri/common/dri_screen.c
          	src/gallium/state_trackers/dri/common/dri_st_api.h
          	src/gallium/state_trackers/dri/drm/dri1.c
          	src/gallium/state_trackers/dri/drm/dri1.h
          	src/gallium/state_trackers/dri/drm/dri2.c
          	src/gallium/state_trackers/python/st_device.c
          	src/gallium/state_trackers/python/st_sample.c
          	src/mesa/state_tracker/st_cb_clear.c
          	src/mesa/state_tracker/st_cb_drawpixels.c
          	src/mesa/state_tracker/st_cb_readpixels.c
          	src/mesa/state_tracker/st_cb_texture.c
          	src/mesa/state_tracker/st_extensions.c
      
      commit 86d9225d
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Wed Mar 31 19:06:06 2010 +0200
      
          gallium: more fixes for bind changes
      
      commit a215ef06
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Wed Mar 31 18:48:36 2010 +0200
      
          gallium/docs: some updates for bind changes
      
      commit c6c7e674
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 30 20:24:26 2010 +0200
      
          gallium: more bind change compile fixes
      
      commit a83fa150
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 30 17:37:13 2010 +0200
      
          compile fixes
      
      commit 30dc8afc
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 30 16:56:28 2010 +0200
      
          fix some merge issues
      
      commit 30aa617f
      Merge: 1dde609a 3a830bc4
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 30 16:09:45 2010 +0200
      
          Merge commit 'origin/gallium-buffer-usage-cleanup' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/nouveau/nouveau_screen.c
          	src/gallium/drivers/nvfx/nvfx_transfer.c
          	src/gallium/winsys/drm/radeon/core/radeon_drm_buffer.c
      
      commit 1dde609a
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Wed Mar 24 02:35:00 2010 +0100
      
          docs: some updates for pipe_resource
      
      commit f236f966
      Author: Luca Barbieri <luca@luca-barbieri.com>
      Date:   Wed Mar 24 01:31:28 2010 +0100
      
          nvfx: fix for gallium-resources
      
          It seems to work with basic applications but almost surely needs more work.
      
          In particular, it probably shouldn't use PIPE_BUFFER_USAGE_* flags
          and should use PIPE_TRANSFER_* in several places.
      
          Also, we probably don't want the vtable indirect calls and that ought
          to be replaced with something better instead.
      
      commit 5a136ad7
      Author: Luca Barbieri <luca@luca-barbieri.com>
      Date:   Wed Mar 24 01:31:19 2010 +0100
      
          nv50: fix build in gallium-resources
      
          Not actually tested.
      
          Also needs next patch tee to actually build, this is just the nv50 part
          split from the rest.
      
      commit 3a830bc4
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 23 14:00:52 2010 -0700
      
          st/egl: fix up for binding flags
      
      commit c6a80dc3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 23 13:52:15 2010 -0700
      
          r300: restore 4k alignment for oqbo buffers
      
      commit e75a8d5e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 23 13:00:07 2010 -0700
      
          gallium: bind flags
      
      commit 1f5b5095
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 23 19:32:21 2010 +0100
      
          i965g: scons compile fixes
      
      commit 2c385f8f
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 23 19:20:33 2010 +0100
      
          nouveau: drm compile fix
      
      commit b285086e
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 23 18:36:19 2010 +0100
      
          r300g: pipe_resource compile fixes
      
          bring back mistakenly deleted radeon_buffer.h
          plus some more
      
      commit 7810606f
      Author: Michal Krol <michal@vmware.com>
      Date:   Tue Mar 23 16:21:03 2010 +0100
      
          softpipe: Map GS constants, too.
      
      commit 366f1176
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 23 15:51:52 2010 +0100
      
          failover: update for pipe_resources
      
      commit 615f44d7
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 23 15:51:02 2010 +0100
      
          identity: remove double is_resource_reference assignment
      
      commit 70085860
      Author: Roland Scheidegger <sroland@vmware.com>
      Date:   Tue Mar 23 15:50:32 2010 +0100
      
          trace: compile fix
      
      commit 058c5697
      Merge: dd7ba137 b33fd3ce
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 23 06:40:39 2010 -0700
      
          Merge commit 'origin/gallium-resources' into gallium-buffer-usage-cleanup
      
          Conflicts:
          	src/gallium/state_trackers/vega/api_filters.c
          	src/mesa/state_tracker/st_cb_drawpixels.c
      
      commit b33fd3ce
      Author: Michal Krol <michal@vmware.com>
      Date:   Mon Mar 22 21:03:26 2010 +0100
      
          gallium: Usage parameter of get_transfer/transfer_inline_write is a bitfield.
      
      commit 9c1162d9
      Author: Michal Krol <michal@vmware.com>
      Date:   Mon Mar 22 20:50:49 2010 +0100
      
          scons: Update file lists after gallium-resources changes.
      
      commit af9793ab
      Author: Michal Krol <michal@vmware.com>
      Date:   Mon Mar 22 20:04:39 2010 +0100
      
          gallium: Do not use `template` for formal parameter names.
      
      commit dc2e12d7
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:41:34 2010 +0000
      
          ws/nouveau: remove pipe_texture reference
      
      commit b94c7232
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:40:41 2010 +0000
      
          ws/xlib: remove pipe_buffer reference in comment
      
      commit 0a2af3ee
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:39:34 2010 +0000
      
          st/vega: clean up reference to pipe_texture
      
      commit 437ce98d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:39:02 2010 +0000
      
          st/python: begin conversion to pipe_resources, much more to do
      
      commit 1b02e1ee
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:29:34 2010 +0000
      
          st/xorg: update for pipe_resources
      
      commit eb39977f
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:23:51 2010 +0000
      
          st/dri: update for pipe_resources
      
      commit e447aeff
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:23:36 2010 +0000
      
          st/egl: update for pipe_resources
      
      commit e4cc48da
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:08:44 2010 +0000
      
          r300: drop use of R300 DONT SYNC flag
      
      commit 129a83ab
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:08:17 2010 +0000
      
          pipebuffer: use transfer flag
      
      commit 575b35ee
      Merge: f29ac73f 9fc6c8b8
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 22:03:25 2010 +0000
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/llvmpipe/lp_texture.c
          	src/gallium/drivers/r300/r300_context.c
          	src/gallium/drivers/r300/r300_texture.c
          	src/gallium/winsys/drm/radeon/core/radeon_buffer.h
      
      commit f29ac73f
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 18:37:25 2010 +0000
      
          cell: attempt to convert to pipe_resources
      
          Can't even compile test this driver.
      
      commit 484b1947
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 17:25:50 2010 +0000
      
          nvfx: restore usage of pipe_winsys
      
          The interface that cannot be killed...
      
      commit ac76ac6e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 17:25:10 2010 +0000
      
          nv50: fix warning
      
      commit 9683f442
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 17:14:31 2010 +0000
      
          util: restore u_simple_screen, nouveau still relies on it
      
      commit 961cbcb6
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 16:51:54 2010 +0000
      
          nouveau: convert nvfx and nv50 to pipe_resources
      
          Compile tested only.
      
          This was a deeper change than I was hoping for, due to the
          layering of the pipe_texture implementation in each driver on
          top of a shared pipe_buffer implementation in the shared code.
      
          Have modified the shared code to act as a set of convenience
          routines operating on nouveau_bo objects.
      
          Each driver now uses the u_resource_vtbl technique to split the
          implementation of pipe_resources between the existing miptree code
          for textures and a new, minimal buffer implementation in each
          driver.
      
          Eventually these should be combined, not least because APIs are now
          allowing things like binding buffer resources as textures and render
          targets.
      
      commit 18ba7401
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 10:02:54 2010 +0000
      
          r300: fix compilation after merge
      
          Also build r300 by default.
      
      commit eb9c0175
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 09:59:49 2010 +0000
      
          st/vega: fix up after merge
      
      commit ea8dd1d4
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 09:59:44 2010 +0000
      
          aux: remove unused piperesource helpers
      
      commit be7af29d
      Merge: d22c2c6c 12deb9e6
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 21 09:54:53 2010 +0000
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/auxiliary/cso_cache/cso_context.c
          	src/gallium/auxiliary/cso_cache/cso_context.h
          	src/gallium/drivers/r300/r300_context.c
          	src/gallium/drivers/r300/r300_render.c
          	src/gallium/drivers/r300/r300_state.c
          	src/gallium/drivers/r300/r300_state_derived.c
          	src/gallium/state_trackers/vega/api_filters.c
          	src/gallium/state_trackers/vega/image.c
          	src/gallium/state_trackers/vega/image.h
          	src/gallium/state_trackers/vega/mask.c
          	src/gallium/state_trackers/vega/mask.h
          	src/gallium/state_trackers/vega/paint.c
          	src/gallium/state_trackers/vega/paint.h
          	src/gallium/state_trackers/vega/renderer.c
          	src/gallium/state_trackers/vega/renderer.h
          	src/gallium/state_trackers/vega/shader.c
          	src/gallium/state_trackers/vega/vg_context.h
          	src/gallium/state_trackers/vega/vg_tracker.c
          	src/mesa/state_tracker/st_manager.c
      
      commit d22c2c6c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Mar 20 11:48:54 2010 +0000
      
          drm/r300: update for r300g pipe_resources conversion
      
          Remove old files that related to pipe_buffers but weren't being
          built.  Hopefully this is correct.
      
      commit f07b2c83
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Mar 20 11:47:03 2010 +0000
      
          r300: convert to pipe_resources
      
          Do a very shallow conversion - basically keeping the existing
          buffer and texture code intact and using a vtbl struct
          inside our resource struct to select between the two implementations.
      
          The buffer and texture treatments could be further merged without
          much effort, but try to keep the existing code working at this point.
      
      commit feca9c3c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 18 06:00:34 2010 +0000
      
          gallium: update new merges to pipe_resource
      
      commit 1cad983e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 18 06:00:19 2010 +0000
      
          drm/sw: update new merges to pipe_resource
      
      commit 191d3949
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 18 06:00:01 2010 +0000
      
          vg: update new merges to pipe_resource
      
      commit b727c59b
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 18 05:59:38 2010 +0000
      
          llvmpipe: update new merges to pipe_resource
      
      commit 5f4b64b3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 18 05:59:23 2010 +0000
      
          brw: pipe_resource fixes
      
      commit d4aca209
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 18 05:59:06 2010 +0000
      
          util: update new merges to pipe_resource
      
      commit cf6bef0a
      Merge: 19972319 6de8e563
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 18 05:38:50 2010 +0000
      
          Merge commit 'origin/master' into gallium-resources
      
      commit 19972319
      Merge: ad88ac79 e1ee3eaf
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Wed Mar 17 08:46:38 2010 +0000
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/auxiliary/Makefile
          	src/gallium/auxiliary/util/u_blit.c
          	src/gallium/auxiliary/util/u_blit.h
          	src/gallium/auxiliary/util/u_gen_mipmap.c
          	src/gallium/auxiliary/util/u_gen_mipmap.h
          	src/mesa/state_tracker/st_cb_texture.c
          	src/mesa/state_tracker/st_gen_mipmap.c
      
      commit ad88ac79
      Merge: 77bc770c 8cdfd121
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 16 09:13:07 2010 +0000
      
          Merge branch 'gallium-sampler-view' into gallium-resources
      
          Conflicts:
          	src/gallium/auxiliary/cso_cache/cso_context.c
          	src/gallium/auxiliary/util/u_blit.c
          	src/gallium/drivers/llvmpipe/lp_texture.c
          	src/gallium/drivers/softpipe/sp_texture.c
          	src/mesa/state_tracker/st_cb_fbo.c
          	src/mesa/state_tracker/st_framebuffer.c
          	src/mesa/state_tracker/st_texture.c
      
      commit 77bc770c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Mon Mar 15 22:21:48 2010 +0000
      
          util: missing file
      
      commit f83c91db
      Merge: c1d47741 42910ebe
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Mon Mar 15 09:48:58 2010 +0000
      
          Merge commit 'origin/gallium-sampler-view' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/nv40/nv40_transfer.c
          	src/gallium/drivers/nvfx/nvfx_transfer.c
          	src/gallium/drivers/trace/tr_drm.c
      
      commit dd7ba137
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 23:54:36 2010 +0000
      
          gallium: start a cleanup of buffer_usage
      
          Remove fairly meaningless CPU/GPU READ/WRITE flags and
          replace with proper usages.
      
      commit c1d47741
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 23:05:45 2010 +0000
      
          llvmpipe: don't FREE userbuffer data
      
      commit 9bfa07af
      Merge: 65757a14 08cddfe2
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 22:54:51 2010 +0000
      
          Merge commit 'origin/master' into gallium-resources
      
          Conflicts:
          	src/gallium/drivers/llvmpipe/lp_rast.c
          	src/gallium/drivers/llvmpipe/lp_scene.c
          	src/gallium/drivers/llvmpipe/lp_texture.c
          	src/gallium/drivers/llvmpipe/lp_texture.h
          	src/gallium/drivers/softpipe/sp_texture.c
          	src/gallium/drivers/svga/svga_screen_texture.c
      
      commit 65757a14
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 22:41:17 2010 +0000
      
          svga: build fixes
      
      commit 2f543522
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 22:39:25 2010 +0000
      
          gallivm: build fix
      
      commit 42642ec0
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 22:38:33 2010 +0000
      
          llvmpipe: convert to pipe_resources
      
      commit 7bbcb21e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 22:19:30 2010 +0000
      
          gallivm: convert to pipe_resources
      
      commit 88ae0d04
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 21:01:22 2010 +0000
      
          configs: build svga
      
      commit 0e112bc6
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 21:01:17 2010 +0000
      
          gallium: restore PIPE_BUFFER_USAGE_CUSTOM
      
      commit 102aca68
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 21:00:41 2010 +0000
      
          util: more transfer helpers
      
      commit a79f6a4a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 20:59:36 2010 +0000
      
          svga: convert to use pipe_resrource
      
          As with others so far, a fairly shallow conversion.
      
      commit 087fb544
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 18:38:08 2010 +0000
      
          brw: fix function name
      
      commit cfc9dd70
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 18:19:06 2010 +0000
      
          gallium: enable brw compile
      
      commit 8a5b86d7
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 18:18:50 2010 +0000
      
          brw: compiles with pipe_resource
      
      commit 563ca458
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 18:18:42 2010 +0000
      
          i915: hook up userbuffer create
      
      commit b5095b48
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 17:20:51 2010 +0000
      
          i915: use helpers for is_resource_referenced
      
      commit d5392bdc
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 17:20:38 2010 +0000
      
          util: helpers for is_resource_referenced
      
      commit 2f3492a5
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 17:08:50 2010 +0000
      
          i915: remove buffer.c again
      
      commit 1373a35b
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 17:08:34 2010 +0000
      
          i915: add new files to scons
      
      commit 0251612d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 16:38:29 2010 +0000
      
          i915: compiling with pipe_resources
      
      commit 9a023586
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 13:51:16 2010 +0000
      
          gallium: remove inline_read transfer
      
      commit a6ba315e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 13:50:32 2010 +0000
      
          trace: get running
      
          Some dumping will be incorrect or disabled, but it runs without
          crashing
      
      commit 2133f1d9
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 13:49:42 2010 +0000
      
          gallium: remove the inline_read transfer
      
          There aren't enough users of this to justify it.
      
      commit bccaf1fa
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 12:30:37 2010 +0000
      
          identity: hook up inline transfer operations
      
      commit e4c152a3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 12:21:54 2010 +0000
      
          gallium: build trace and identity
      
      commit 0b5a311d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 12:21:36 2010 +0000
      
          gallium: add more of the transfer state to pipe_transfer
      
          Not really sure if recording all the arguments to the
          create_{transfer,texture,surface,etc} functions in the result of those
          calls is a great idea, but it seems we're fairly dependent on it
          throughout the code.
      
      commit a23985c2
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 12:19:46 2010 +0000
      
          identity: compiles with pipe_resources
      
      commit d0d63094
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 12:13:02 2010 +0000
      
          trace: compiles with pipe_resources
      
      commit a4451ea4
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 11:39:50 2010 +0000
      
          softpipe: give userbuffers a format other than NONE
      
          Most mesa demos working
      
      commit 32bb1bd4
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 11:39:21 2010 +0000
      
          util: correct argument order in pipe_buffer_map
      
      commit 7e2696c0
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 11:32:55 2010 +0000
      
          softpipe: transfer flush
      
      commit a0543b13
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 11:32:13 2010 +0000
      
          util: noop implementation of transfer_flush_region
      
      commit ce418533
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 11:26:07 2010 +0000
      
          gallium: softpipe runs gears with pipe_resources
      
      commit bfda4f2e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 11:25:48 2010 +0000
      
          util: get clip_tile working again
      
      commit f5ef219c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 09:43:20 2010 +0000
      
          softpipe: use u_transfer helpers
      
      commit 072957aa
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 09:42:46 2010 +0000
      
          util: helpers for inline transfers
      
      commit 9c45561f
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 09:42:25 2010 +0000
      
          util: fix typo calculating transfer box
      
      commit f3e98fd4
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 09:25:46 2010 +0000
      
          st/vega: convert to pipe_resource
      
      commit d1b7b00a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sun Mar 14 08:37:56 2010 +0000
      
          gallium: begin converting drivers to pipe_resource
      
          Work in progress...
      
      commit 51c25117
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Mar 13 20:16:27 2010 +0000
      
          gallium: work in progress on layering resources on top of old textures
      
          Helper code in an aux module to avoid rewriting all the drivers.
      
      commit fb6764d3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Mar 13 19:19:09 2010 +0000
      
          heaps of wip
      
      commit ee6b3bc7
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Mar 13 16:38:02 2010 +0000
      
          wip2
      
      commit 18308802
      Merge: 90b4045f 47bfbd45
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Mar 13 15:14:03 2010 +0000
      
          Merge branch 'gallium-sampler-view' into gallium-resources
      
          Conflicts:
          	src/gallium/include/pipe/p_context.h
          	src/mesa/state_tracker/st_atom_texture.c
          	src/mesa/state_tracker/st_cb_bitmap.c
          	src/mesa/state_tracker/st_cb_drawpixels.c
          	src/mesa/state_tracker/st_cb_texture.c
          	src/mesa/state_tracker/st_context.c
          	src/mesa/state_tracker/st_context.h
          	src/mesa/state_tracker/st_texture.h
      
      commit 90b4045f
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Sat Mar 13 14:52:43 2010 +0000
      
          wip
      287c94ea
  17. 08 Apr, 2010 1 commit
  18. 07 Apr, 2010 2 commits
  19. 06 Apr, 2010 1 commit
  20. 11 Mar, 2010 1 commit
    • Keith Whitwell's avatar
      Squashed commit of gallium-context-transfers: · b43c182f
      Keith Whitwell authored
      commit 7a2ee04629681e59ea147b440856c4f9a33ae9f8
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 11 14:19:17 2010 +0000
      
          nv: convert to context transfers
      
      commit 188a3f5331c8e5966729fd59d02975afb7324adc
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 11 14:11:10 2010 +0000
      
          nouveau: remove unused variable
      
      commit 5c8e880ab4dc020358c08728b8adb1637d2dc5bc
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 11 12:31:21 2010 +0000
      
          mesa/st: fix compilation after merge
      
      commit c552595333f860c2a4807e195596acdf5d6a5ef8
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 11 12:31:06 2010 +0000
      
          util: fix compilation after merge
      
      commit e80836878a3617b0e350d2a8f92311832a1476cb
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 11 12:30:47 2010 +0000
      
          r300g: fix compilation after merge
      
      commit 0e4883e9511b9db4e75a4dbc78d7bb970badc15d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 11 12:18:45 2010 +0000
      
          i965g: fix incorrect merge
      
      commit 17d74133d8168eebf93bf1390de79930fc8da231
      Merge: cb81c79 aa311ae6
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Mar 11 12:08:32 2010 +0000
      
          Merge commit 'origin/master' into gallium-context-transfers
      
          Conflicts:
          	src/gallium/drivers/i965/brw_screen_texture.c
          	src/gallium/drivers/r300/r300_screen.c
          	src/gallium/drivers/softpipe/sp_texture.c
          	src/gallium/drivers/svga/svga_screen_texture.c
          	src/gallium/state_trackers/egl/x11/native_ximage.c
      
      commit cb81c79098bc3a92a4d2a3dcc0edc972dfb407be
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 2 16:04:01 2010 +0000
      
          egl/x11: hack for context transfers
      
          There is a better approach to this in the winsys-handle branch, but
          for now avoid using transfers at all by always allocating our own
          backing store directly.
      
      commit f44a24e1d4ad7563f3eedd6b3a5688f53a36265c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 2 16:03:16 2010 +0000
      
          llvmpipe: context transfers
      
      commit 4d7475ef8104b3b478c7c6ce77cd3506c57e25d1
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 2 16:02:50 2010 +0000
      
          llvmpipe: disable testprogs build
      
          Not working.
      
      commit a9bf98c4d36bd92a76f81e83747eb9b8f0a0515f
      Merge: ee0f97e 0c616da2
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Tue Mar 2 15:28:25 2010 +0000
      
          Merge commit 'origin/master' into gallium-context-transfers
      
          Conflicts:
          	src/mesa/state_tracker/st_cb_accum.c
          	src/mesa/state_tracker/st_cb_bitmap.c
      
      commit ee0f97e8d9fd5ef57211a8e1268f505c9829e246
      Merge: a7f078e 828f5452
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Feb 19 13:00:29 2010 +0000
      
          Merge commit 'origin/master' into gallium-context-transfers
      
          Conflicts:
          	src/gallium/auxiliary/util/u_debug.h
          	src/gallium/drivers/i915/i915_context.h
          	src/gallium/drivers/llvmpipe/lp_flush.c
          	src/gallium/drivers/nv30/nv30_screen.h
          	src/gallium/drivers/nv40/nv40_context.h
          	src/gallium/drivers/nv40/nv40_screen.h
          	src/gallium/drivers/nv50/nv50_context.h
          	src/gallium/drivers/r300/r300_screen.c
          	src/gallium/drivers/r300/r300_winsys.h
          	src/gallium/drivers/softpipe/sp_context.c
          	src/gallium/drivers/trace/tr_context.c
          	src/gallium/state_trackers/dri/dri_context.c
          	src/gallium/state_trackers/egl/common/egl_g3d.c
          	src/gallium/state_trackers/python/st_device.c
          	src/gallium/winsys/drm/radeon/core/radeon_drm.c
      
      commit a7f078e16d851b53ef316066dcced46eb39ebe24
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Feb 5 14:16:11 2010 +0000
      
          gallium: move texture transfers to pipe_context
      
      commit 7b2ffc2019d72e833afea7eebf3e80121187375d
      Merge: 51e190e c036d13d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Feb 5 09:55:02 2010 +0000
      
          Merge commit 'origin/master' into gallium-screen-context
      
          Conflicts:
          	src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
      
          This branch has got a pretty tortured history now, I expect
          a squash merge will be appropriate when it is done.
      
      commit 51e190e95acf120f72768fafb29e9721e358df1b
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 17:58:02 2010 +0000
      
          gallium: fix some build issues
      
      commit f524bdaa723fb181637ad30c6ad708aeedabe25b
      Merge: f906212 3aba0a28
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 17:51:32 2010 +0000
      
          Merge commit 'origin/master' into gallium-screen-context
      
      commit f9062126883199eabf045714c717cd35f4b7b313
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 17:17:12 2010 +0000
      
          gallium/docs: small description of screen::create_context
      
      commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:42:42 2010 +0000
      
          drm/radeon: more dead create_context wrapper removal
      
      commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:42:30 2010 +0000
      
          drm/i965: more dead create_context wrapper removal
      
      commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:42:05 2010 +0000
      
          st/python: more dead create_context wrapper removal
      
      commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:37:58 2010 +0000
      
          idenity: wrapped context creation
      
      commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:28:47 2010 +0000
      
          ws/gdi: remove dead context_create wrapper
      
      commit 132b55f4bec39386ac625f09aaa11f609664024c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:27:52 2010 +0000
      
          ws/gdi: remove dead context_create wrapper
      
      commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:25:38 2010 +0000
      
          st/xorg: use screen::context_create
      
      commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:23:20 2010 +0000
      
          glx/xlib: simplify creation of trace-wrapped contexts
      
          Trace screen knows how to properly wrap context creation in the
          wrapped screen, so nothing special to do here.
      
      commit c99404c03ebaec4175f08a2f363e43c9085f2635
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:18:24 2010 +0000
      
          st/python: no need to special case context creation for trace
      
      commit 193a527a682b6877bb1faecd8092df4dfd055a18
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:15:30 2010 +0000
      
          drm/radeon: remove dead create_context declaration
      
      commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:14:58 2010 +0000
      
          nv/drm: remove dead create_context ref
      
      commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:12:51 2010 +0000
      
          st/egl: remove a layer of wrappers around screen::create_context
      
      commit 39caa6672a04122f185c22e17aab86d1c40938bf
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:05:28 2010 +0000
      
          r300g: fill in screen::context_create
      
      commit 407f12556d16ba0656774d8a1d9ebda22f82f473
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:04:04 2010 +0000
      
          cell: adapt for screen::create_context, untested
      
      commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:50:24 2010 +0000
      
          drm/nv: adapt for screen::create_context
      
          All contexts now created directly through the screen, so remove
          equivalent code here.
      
          Remove apparently un-needed array of contexts in the winsys.
      
      commit 53eec5b1349aa1b6892a75a7bff7e7530957aeae
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:50:08 2010 +0000
      
          stw: adapt for screen::create_context, untested
      
      commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:49:20 2010 +0000
      
          trace: expose the wrapped context's priv data
      
          If we are going to keep this priv idea, really want an accessor
          function for it so that trace and other drivers can wrap that.
      
      commit 75d6104e11d86ec2b0749627ed58e35f856ee6eb
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:47:55 2010 +0000
      
          nv30: adapt to screen::context_create
      
      commit 12f5deb6ed9723e9b5d34577052b8365813ca14e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:44:47 2010 +0000
      
          nv40: adapt to screen::context_create
      
      commit 14baccaa3b6bbb3b91056126f6521828e786dc62
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:35:27 2010 +0000
      
          nv50: adapt to screen::create_context
      
          Not build tested.  Need to figure out how to build nouveau.
      
      commit a0e94505ccd2d7f3e604465a2ac302f1286b73b6
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:22:27 2010 +0000
      
          llvmpipe: update for screen::create_context, untested
      
      commit 0eae17107c950346030e4f7e0ec232f868d3893d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:16:57 2010 +0000
      
          xlib/llvmpipe: remove dead winsys context creation path
      
      commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 14:58:27 2010 +0000
      
          gallium: convert most code to use screen::create_context
      
          I wish I could build all of gallium at once to find breakages.
      
      commit d7b57f4061b82322cbcae176125913d9f0dea6c1
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 12:46:21 2010 +0000
      
          glx: permit building with older protocol headers
      
          I'd like to be able to build mesa on current distro releases without
          having to upgrade from the standard dri2proto and glproto headers.  With
          this change I'm able to build on ancient releases such as Ubuntu 9-10...
      
          In general, it would be nice to be able to build-test mesa to check for
          unintended breakages without having to follow the external dependencies
          of every group working on the codebase.
      
      commit 57adedd6fb06c98572ed8d4aef19203df4c4eea2
      Merge: da71847 e1906ae9
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 11:38:15 2010 +0000
      
          Merge commit 'origin/master' into gallium-screen-context
      
          Conflicts:
          	src/gallium/drivers/softpipe/sp_video_context.h
          	src/gallium/drivers/trace/tr_context.c
          	src/gallium/state_trackers/wgl/shared/stw_context.c
          	src/gallium/winsys/gdi/gdi_softpipe_winsys.c
      
      commit da71847ea6414d7e352c6094f8963bb4eda344dc
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:57:39 2009 +0100
      
          wgl: Use pipe_screen::context_create.
      
      commit 2595a188f93fd903600ef5d8517737ee0592035d
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:56:47 2009 +0100
      
          trace: Implement pipe_screen::context_create.
      
      commit f3640e4ae37a5260cbfba999d079f827de0a313a
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:56:17 2009 +0100
      
          softpipe: Implement pipe_screen::context_create.
      
      commit 347266bddc8bd39c711bacb2193793759d0f3696
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:55:31 2009 +0100
      
          gallium: New pipe_screen::context_create callback.
      b43c182f
  21. 02 Mar, 2010 1 commit
    • Keith Whitwell's avatar
      llvmpipe: reorganize transfer usage · 5fe2ce28
      Keith Whitwell authored
      Move transfer creation and mapping to the "scene" object, and out of
      the rasterizer.  The rasterizer operates on already-mapped
      framebuffers only, and no longer needs a screen or context pointer.
      
      The scene object has access to a pipe_context, and this reorg prepares
      for moving transfer functionality from the screen to the context.
      5fe2ce28
  22. 01 Mar, 2010 1 commit
  23. 23 Feb, 2010 1 commit
  24. 10 Feb, 2010 2 commits
  25. 08 Feb, 2010 1 commit
    • Keith Whitwell's avatar
      gallium: squash-merge of gallium screen context · 7f41f544
      Keith Whitwell authored
      Squashed commit of the following:
      
      commit 009598122adf5cad42bf9af067eccaf8e89e1233
      Author: Christoph Bumiller <e0425955@student.tuwien.ac.at>
      Date:   Mon Feb 8 11:03:26 2010 +0000
      
          nouveau: fix gallium-screen-context branch fallout
      
      commit 7b2ffc2019d72e833afea7eebf3e80121187375d
      Merge: 51e190e c036d13d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Fri Feb 5 09:55:02 2010 +0000
      
          Merge commit 'origin/master' into gallium-screen-context
      
          Conflicts:
          	src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
      
          This branch has got a pretty tortured history now, I expect
          a squash merge will be appropriate when it is done.
      
      commit 51e190e95acf120f72768fafb29e9721e358df1b
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 17:58:02 2010 +0000
      
          gallium: fix some build issues
      
      commit f524bdaa723fb181637ad30c6ad708aeedabe25b
      Merge: f906212 3aba0a28
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 17:51:32 2010 +0000
      
          Merge commit 'origin/master' into gallium-screen-context
      
      commit f9062126883199eabf045714c717cd35f4b7b313
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 17:17:12 2010 +0000
      
          gallium/docs: small description of screen::create_context
      
      commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:42:42 2010 +0000
      
          drm/radeon: more dead create_context wrapper removal
      
      commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:42:30 2010 +0000
      
          drm/i965: more dead create_context wrapper removal
      
      commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:42:05 2010 +0000
      
          st/python: more dead create_context wrapper removal
      
      commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:37:58 2010 +0000
      
          idenity: wrapped context creation
      
      commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:28:47 2010 +0000
      
          ws/gdi: remove dead context_create wrapper
      
      commit 132b55f4bec39386ac625f09aaa11f609664024c
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:27:52 2010 +0000
      
          ws/gdi: remove dead context_create wrapper
      
      commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:25:38 2010 +0000
      
          st/xorg: use screen::context_create
      
      commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:23:20 2010 +0000
      
          glx/xlib: simplify creation of trace-wrapped contexts
      
          Trace screen knows how to properly wrap context creation in the
          wrapped screen, so nothing special to do here.
      
      commit c99404c03ebaec4175f08a2f363e43c9085f2635
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:18:24 2010 +0000
      
          st/python: no need to special case context creation for trace
      
      commit 193a527a682b6877bb1faecd8092df4dfd055a18
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:15:30 2010 +0000
      
          drm/radeon: remove dead create_context declaration
      
      commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:14:58 2010 +0000
      
          nv/drm: remove dead create_context ref
      
      commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:12:51 2010 +0000
      
          st/egl: remove a layer of wrappers around screen::create_context
      
      commit 39caa6672a04122f185c22e17aab86d1c40938bf
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:05:28 2010 +0000
      
          r300g: fill in screen::context_create
      
      commit 407f12556d16ba0656774d8a1d9ebda22f82f473
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 16:04:04 2010 +0000
      
          cell: adapt for screen::create_context, untested
      
      commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:50:24 2010 +0000
      
          drm/nv: adapt for screen::create_context
      
          All contexts now created directly through the screen, so remove
          equivalent code here.
      
          Remove apparently un-needed array of contexts in the winsys.
      
      commit 53eec5b1349aa1b6892a75a7bff7e7530957aeae
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:50:08 2010 +0000
      
          stw: adapt for screen::create_context, untested
      
      commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:49:20 2010 +0000
      
          trace: expose the wrapped context's priv data
      
          If we are going to keep this priv idea, really want an accessor
          function for it so that trace and other drivers can wrap that.
      
      commit 75d6104e11d86ec2b0749627ed58e35f856ee6eb
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:47:55 2010 +0000
      
          nv30: adapt to screen::context_create
      
      commit 12f5deb6ed9723e9b5d34577052b8365813ca14e
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:44:47 2010 +0000
      
          nv40: adapt to screen::context_create
      
      commit 14baccaa3b6bbb3b91056126f6521828e786dc62
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:35:27 2010 +0000
      
          nv50: adapt to screen::create_context
      
          Not build tested.  Need to figure out how to build nouveau.
      
      commit a0e94505ccd2d7f3e604465a2ac302f1286b73b6
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:22:27 2010 +0000
      
          llvmpipe: update for screen::create_context, untested
      
      commit 0eae17107c950346030e4f7e0ec232f868d3893d
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 15:16:57 2010 +0000
      
          xlib/llvmpipe: remove dead winsys context creation path
      
      commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 14:58:27 2010 +0000
      
          gallium: convert most code to use screen::create_context
      
          I wish I could build all of gallium at once to find breakages.
      
      commit d7b57f4061b82322cbcae176125913d9f0dea6c1
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 12:46:21 2010 +0000
      
          glx: permit building with older protocol headers
      
          I'd like to be able to build mesa on current distro releases without
          having to upgrade from the standard dri2proto and glproto headers.  With
          this change I'm able to build on ancient releases such as Ubuntu 9-10...
      
          In general, it would be nice to be able to build-test mesa to check for
          unintended breakages without having to follow the external dependencies
          of every group working on the codebase.
      
      commit 57adedd6fb06c98572ed8d4aef19203df4c4eea2
      Merge: da71847 e1906ae9
      Author: Keith Whitwell <keithw@vmware.com>
      Date:   Thu Feb 4 11:38:15 2010 +0000
      
          Merge commit 'origin/master' into gallium-screen-context
      
          Conflicts:
          	src/gallium/drivers/softpipe/sp_video_context.h
          	src/gallium/drivers/trace/tr_context.c
          	src/gallium/state_trackers/wgl/shared/stw_context.c
          	src/gallium/winsys/gdi/gdi_softpipe_winsys.c
      
      commit da71847ea6414d7e352c6094f8963bb4eda344dc
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:57:39 2009 +0100
      
          wgl: Use pipe_screen::context_create.
      
      commit 2595a188f93fd903600ef5d8517737ee0592035d
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:56:47 2009 +0100
      
          trace: Implement pipe_screen::context_create.
      
      commit f3640e4ae37a5260cbfba999d079f827de0a313a
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:56:17 2009 +0100
      
          softpipe: Implement pipe_screen::context_create.
      
      commit 347266bddc8bd39c711bacb2193793759d0f3696
      Author: José Fonseca <jfonseca@vmware.com>
      Date:   Sat May 2 08:55:31 2009 +0100
      
          gallium: New pipe_screen::context_create callback.
      7f41f544