Mesa (gallium-array-textures): gallium: adapt code to interface changes

Roland Scheidegger sroland at kemper.freedesktop.org
Wed Jun 16 09:48:21 PDT 2010


Module: Mesa
Branch: gallium-array-textures
Commit: 621737a638d187d208712250fc19a91978fdea6b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=621737a638d187d208712250fc19a91978fdea6b

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Wed Jun 16 17:47:38 2010 +0100

gallium: adapt code to interface changes

There are still usages of pipe_surface where pipe_resource should be used,
which should eventually be fixed.

---

 src/gallium/auxiliary/gallivm/lp_bld_sample.c      |    4 +-
 src/gallium/auxiliary/util/u_blit.c                |   14 ++---
 src/gallium/auxiliary/util/u_blitter.c             |   13 +++--
 src/gallium/auxiliary/util/u_debug.c               |   20 +++---
 src/gallium/auxiliary/util/u_dump_state.c          |    8 +--
 src/gallium/auxiliary/util/u_gen_mipmap.c          |   11 +++-
 src/gallium/auxiliary/util/u_inlines.h             |    4 +-
 src/gallium/auxiliary/util/u_sampler.c             |    8 +-
 src/gallium/auxiliary/util/u_surface.c             |   27 ++++++--
 src/gallium/auxiliary/util/u_surface.h             |    4 +
 src/gallium/auxiliary/util/u_surfaces.c            |    5 +-
 src/gallium/auxiliary/util/u_surfaces.h            |    2 +-
 src/gallium/drivers/cell/ppu/cell_texture.c        |   28 +++------
 src/gallium/drivers/i915/i915_state_emit.c         |    9 ++-
 src/gallium/drivers/i915/i915_surface.c            |   29 +++++----
 src/gallium/drivers/i965/brw_misc_state.c          |    5 +-
 src/gallium/drivers/i965/brw_pipe_clear.c          |    4 +-
 src/gallium/drivers/i965/brw_pipe_surface.c        |   30 ++++-----
 src/gallium/drivers/i965/brw_screen.h              |    3 +-
 src/gallium/drivers/identity/id_context.c          |   10 +---
 src/gallium/drivers/llvmpipe/lp_rast.c             |   32 +++++-----
 src/gallium/drivers/llvmpipe/lp_texture.c          |   21 +++---
 src/gallium/drivers/nv50/nv50_context.h            |    1 +
 src/gallium/drivers/nv50/nv50_miptree.c            |   46 +++++++-------
 src/gallium/drivers/nv50/nv50_resource.h           |    3 +-
 src/gallium/drivers/nv50/nv50_state_validate.c     |   16 +++---
 src/gallium/drivers/nv50/nv50_surface.c            |   32 ++++++---
 src/gallium/drivers/nv50/nv50_tex.c                |    2 +-
 src/gallium/drivers/nvfx/nv04_surface_2d.c         |   31 ++++++----
 src/gallium/drivers/nvfx/nv04_surface_2d.h         |    1 +
 src/gallium/drivers/nvfx/nvfx_miptree.c            |   20 +++---
 src/gallium/drivers/nvfx/nvfx_resource.h           |    3 +-
 src/gallium/drivers/nvfx/nvfx_state_fb.c           |    4 +-
 src/gallium/drivers/nvfx/nvfx_surface.c            |   20 +++++--
 src/gallium/drivers/nvfx/nvfx_transfer.c           |   50 +++++++++------
 src/gallium/drivers/r300/r300_state.c              |   10 ++--
 src/gallium/drivers/r300/r300_state_derived.c      |    6 +-
 src/gallium/drivers/r300/r300_texture.c            |   24 +++----
 src/gallium/drivers/r300/r300_texture.h            |    5 +-
 src/gallium/drivers/r600/r600_state.c              |    4 +-
 src/gallium/drivers/r600/r600_texture.c            |   20 +++---
 src/gallium/drivers/rbug/rbug_context.c            |   10 +---
 src/gallium/drivers/softpipe/sp_texture.c          |   19 +++---
 src/gallium/drivers/softpipe/sp_tile_cache.c       |    2 +-
 src/gallium/drivers/svga/svga_surface.c            |   65 ++++++++++----------
 src/gallium/drivers/trace/tr_context.c             |   13 +---
 src/gallium/drivers/trace/tr_dump_state.c          |   21 ++++---
 .../state_trackers/dri/common/dri1_helper.c        |   15 +++-
 src/gallium/state_trackers/python/st_device.h      |    9 +++-
 src/gallium/state_trackers/vega/api_filters.c      |   10 ++-
 src/gallium/state_trackers/vega/image.c            |   17 +++--
 src/gallium/state_trackers/vega/mask.c             |    9 ++-
 src/gallium/state_trackers/vega/renderer.c         |   11 ++-
 src/gallium/state_trackers/vega/vg_context.c       |   17 +++--
 src/gallium/state_trackers/vega/vg_manager.c       |   23 ++++---
 src/gallium/state_trackers/xorg/xorg_exa.c         |   16 ++++-
 src/gallium/tests/graw/clear.c                     |   10 ++-
 src/gallium/tests/graw/fs-test.c                   |   16 +++---
 src/gallium/tests/graw/gs-test.c                   |   14 ++--
 src/gallium/tests/graw/quad-tex.c                  |   14 ++--
 src/gallium/tests/graw/tri-gs.c                    |   10 ++-
 src/gallium/tests/graw/tri.c                       |   10 ++-
 src/gallium/tests/graw/vs-test.c                   |   14 ++--
 src/gallium/tests/trivial/quad-tex.c               |    8 ++-
 src/gallium/tests/trivial/tri.c                    |    8 ++-
 src/mesa/state_tracker/st_atom_framebuffer.c       |   12 +++-
 src/mesa/state_tracker/st_cb_blit.c                |    8 +-
 src/mesa/state_tracker/st_cb_fbo.c                 |   19 ++++--
 src/mesa/state_tracker/st_cb_texture.c             |   32 ++++++----
 src/mesa/state_tracker/st_manager.c                |   20 ++++--
 70 files changed, 589 insertions(+), 452 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=621737a638d187d208712250fc19a91978fdea6b


More information about the mesa-commit mailing list