Mesa (master): gallium: unify transfer functions

Marek Olšák mareko at kemper.freedesktop.org
Thu Oct 11 19:53:55 UTC 2012


Module: Mesa
Branch: master
Commit: 369e46888904c6d379b8b477d9242cff1608e30e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=369e46888904c6d379b8b477d9242cff1608e30e

Author: Marek Olšák <maraeo at gmail.com>
Date:   Mon Oct  8 04:06:42 2012 +0200

gallium: unify transfer functions

"get_transfer + transfer_map" becomes "transfer_map".
"transfer_unmap + transfer_destroy" becomes "transfer_unmap".

transfer_map must create and return the transfer object and transfer_unmap
must destroy it.

transfer_map is successful if the returned buffer pointer is not NULL.
If transfer_map fails, the pointer to the transfer object remains unchanged
(i.e. doesn't have to be NULL).

Acked-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/auxiliary/draw/draw_pipe_aaline.c      |   12 +-
 src/gallium/auxiliary/draw/draw_pipe_pstipple.c    |    6 +-
 src/gallium/auxiliary/util/u_debug.c               |   29 ++---
 src/gallium/auxiliary/util/u_debug.h               |    4 +-
 src/gallium/auxiliary/util/u_gen_mipmap.c          |   62 +++------
 src/gallium/auxiliary/util/u_inlines.h             |   66 +++-------
 src/gallium/auxiliary/util/u_pstipple.c            |    6 +-
 src/gallium/auxiliary/util/u_resource.c            |   28 +---
 src/gallium/auxiliary/util/u_slab.h                |    2 +-
 src/gallium/auxiliary/util/u_surface.c             |   74 +++++------
 src/gallium/auxiliary/util/u_tile.c                |  105 +++++----------
 src/gallium/auxiliary/util/u_tile.h                |   52 ++++----
 src/gallium/auxiliary/util/u_transfer.c            |   50 +------
 src/gallium/auxiliary/util/u_transfer.h            |   44 ++-----
 src/gallium/auxiliary/util/u_upload_mgr.c          |    4 +-
 src/gallium/auxiliary/vl/vl_idct.c                 |   22 +---
 src/gallium/auxiliary/vl/vl_mpeg12_decoder.c       |   13 +-
 src/gallium/auxiliary/vl/vl_zscan.c                |   45 ++-----
 src/gallium/docs/source/context.rst                |   24 ++--
 src/gallium/drivers/galahad/glhd_context.c         |   65 +++------
 src/gallium/drivers/galahad/glhd_objects.c         |    4 +-
 src/gallium/drivers/i915/i915_resource.c           |    2 -
 src/gallium/drivers/i915/i915_resource_buffer.c    |   37 ++----
 src/gallium/drivers/i915/i915_resource_texture.c   |   92 +++++--------
 src/gallium/drivers/identity/id_context.c          |   52 +++-----
 src/gallium/drivers/identity/id_objects.c          |   10 +-
 src/gallium/drivers/identity/id_objects.h          |    2 +-
 src/gallium/drivers/llvmpipe/lp_texture.c          |  104 ++++++---------
 src/gallium/drivers/noop/noop_pipe.c               |   55 +++-----
 src/gallium/drivers/nouveau/nouveau_buffer.c       |  102 +++++++--------
 src/gallium/drivers/nv30/nv30_miptree.c            |   59 ++++-----
 src/gallium/drivers/nv30/nv30_resource.c           |    2 -
 src/gallium/drivers/nv50/nv50_miptree.c            |    2 -
 src/gallium/drivers/nv50/nv50_resource.c           |    2 -
 src/gallium/drivers/nv50/nv50_resource.h           |   15 +--
 src/gallium/drivers/nv50/nv50_transfer.c           |   63 ++++-----
 src/gallium/drivers/nvc0/nvc0_miptree.c            |    2 -
 src/gallium/drivers/nvc0/nvc0_resource.c           |    2 -
 src/gallium/drivers/nvc0/nvc0_resource.h           |   15 +--
 src/gallium/drivers/nvc0/nvc0_transfer.c           |   63 ++++-----
 src/gallium/drivers/r300/r300_resource.c           |    2 -
 src/gallium/drivers/r300/r300_screen_buffer.c      |   80 +++++-------
 src/gallium/drivers/r300/r300_texture.c            |    2 -
 src/gallium/drivers/r300/r300_transfer.c           |  105 ++++++---------
 src/gallium/drivers/r300/r300_transfer.h           |   15 +--
 src/gallium/drivers/r600/compute_memory_pool.c     |   17 +--
 src/gallium/drivers/r600/evergreen_compute.c       |   94 ++++++--------
 src/gallium/drivers/r600/evergreen_compute.h       |   11 +-
 src/gallium/drivers/r600/r600_buffer.c             |  113 ++++++++--------
 src/gallium/drivers/r600/r600_resource.c           |    2 -
 src/gallium/drivers/r600/r600_resource.h           |   13 --
 src/gallium/drivers/r600/r600_texture.c            |  138 +++++++++-----------
 src/gallium/drivers/radeonsi/r600_buffer.c         |   53 +++-----
 src/gallium/drivers/radeonsi/r600_resource.c       |    2 -
 src/gallium/drivers/radeonsi/r600_texture.c        |   99 ++++++--------
 src/gallium/drivers/rbug/rbug_context.c            |   60 ++-------
 src/gallium/drivers/rbug/rbug_core.c               |   11 +-
 src/gallium/drivers/rbug/rbug_objects.c            |    4 +-
 src/gallium/drivers/softpipe/sp_context.c          |   32 -----
 src/gallium/drivers/softpipe/sp_draw_arrays.c      |    2 -
 src/gallium/drivers/softpipe/sp_flush.c            |    8 -
 src/gallium/drivers/softpipe/sp_state.h            |    6 -
 src/gallium/drivers/softpipe/sp_tex_tile_cache.c   |   41 ++----
 src/gallium/drivers/softpipe/sp_texture.c          |   88 +++++--------
 src/gallium/drivers/softpipe/sp_tile_cache.c       |   74 ++++-------
 src/gallium/drivers/softpipe/sp_tile_cache.h       |    6 -
 src/gallium/drivers/svga/svga_resource.c           |    2 -
 src/gallium/drivers/svga/svga_resource_buffer.c    |   36 +-----
 src/gallium/drivers/svga/svga_resource_texture.c   |   64 ++++------
 src/gallium/drivers/svga/svga_swtnl_backend.c      |    4 +-
 src/gallium/drivers/trace/tr_context.c             |   54 ++------
 src/gallium/drivers/trace/tr_texture.c             |    6 +-
 src/gallium/include/pipe/p_context.h               |   31 ++---
 src/gallium/include/pipe/p_defines.h               |    6 +-
 .../state_trackers/clover/core/resource.cpp        |   11 +-
 .../state_trackers/d3d1x/gd3d11/d3d11_context.h    |    8 +-
 src/gallium/state_trackers/dri/sw/drisw.c          |   10 +-
 src/gallium/state_trackers/glx/xlib/xm_api.c       |   23 +---
 src/gallium/state_trackers/vdpau/output.c          |   12 +--
 src/gallium/state_trackers/vdpau/surface.c         |   13 +--
 src/gallium/state_trackers/vega/api_filters.c      |   10 +-
 src/gallium/state_trackers/vega/api_images.c       |   12 +-
 src/gallium/state_trackers/vega/image.c            |   23 ++--
 src/gallium/state_trackers/vega/paint.c            |   10 +-
 src/gallium/state_trackers/xa/xa_context.c         |   30 ++---
 src/gallium/state_trackers/xorg/xorg_crtc.c        |   10 +-
 src/gallium/state_trackers/xorg/xorg_exa.c         |   43 +++----
 src/gallium/state_trackers/xorg/xorg_xv.c          |   31 ++---
 src/gallium/state_trackers/xvmc/subpicture.c       |   35 ++---
 src/gallium/tests/graw/fs-test.c                   |   12 +-
 src/gallium/tests/graw/graw_util.h                 |    2 +-
 src/gallium/tests/graw/gs-test.c                   |   12 +-
 src/gallium/tests/graw/quad-sample.c               |   12 +-
 src/gallium/tests/graw/vs-test.c                   |   12 +-
 src/gallium/tests/trivial/quad-tex.c               |    6 +-
 src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c  |   24 ++--
 src/mesa/state_tracker/st_atom_pixeltransfer.c     |    8 +-
 src/mesa/state_tracker/st_cb_bitmap.c              |   26 ++---
 src/mesa/state_tracker/st_cb_bufferobjects.c       |    3 +
 src/mesa/state_tracker/st_cb_drawpixels.c          |   60 ++++-----
 src/mesa/state_tracker/st_cb_fbo.c                 |   15 +-
 src/mesa/state_tracker/st_cb_texture.c             |   50 ++++----
 src/mesa/state_tracker/st_texture.c                |   18 +--
 103 files changed, 1205 insertions(+), 2015 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=369e46888904c6d379b8b477d9242cff1608e30e



More information about the mesa-commit mailing list