Mesa (master): gallium: remove flags from the flush function

Marek Olšák mareko at kemper.freedesktop.org
Fri Mar 11 20:40:34 UTC 2011


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Mar  8 00:57:48 2011 +0100

gallium: remove flags from the flush function

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.

---

 src/gallium/docs/d3d11ddi.txt                      |    4 +-
 src/gallium/drivers/cell/ppu/cell_flush.c          |    7 +--
 src/gallium/drivers/failover/fo_context.c          |    4 +-
 src/gallium/drivers/galahad/glhd_context.c         |    2 -
 src/gallium/drivers/i915/i915_flush.c              |    2 +-
 src/gallium/drivers/i965/brw_pipe_flush.c          |    1 -
 src/gallium/drivers/identity/id_context.c          |    2 -
 src/gallium/drivers/llvmpipe/lp_context.c          |    3 +-
 src/gallium/drivers/llvmpipe/lp_flush.c            |   39 +++++------
 src/gallium/drivers/llvmpipe/lp_flush.h            |    2 -
 src/gallium/drivers/llvmpipe/lp_query.c            |    4 +-
 src/gallium/drivers/llvmpipe/lp_setup.c            |    8 +--
 src/gallium/drivers/llvmpipe/lp_setup.h            |    1 -
 src/gallium/drivers/llvmpipe/lp_surface.c          |    2 -
 src/gallium/drivers/llvmpipe/lp_texture.c          |    1 -
 src/gallium/drivers/noop/noop_pipe.c               |    2 +-
 src/gallium/drivers/nv50/nv50_context.c            |   10 ++--
 src/gallium/drivers/nvc0/nvc0_context.c            |   15 ++--
 src/gallium/drivers/nvfx/nvfx_context.c            |    7 +-
 src/gallium/drivers/nvfx/nvfx_state_emit.c         |    2 +-
 src/gallium/drivers/r300/r300_flush.c              |    2 -
 src/gallium/drivers/r300/r300_transfer.c           |    2 +-
 src/gallium/drivers/r600/r600_pipe.c               |    2 +-
 src/gallium/drivers/r600/r600_query.c              |    2 +-
 src/gallium/drivers/r600/r600_texture.c            |    4 +-
 src/gallium/drivers/rbug/rbug_context.c            |    2 -
 src/gallium/drivers/rbug/rbug_core.c               |    2 +-
 src/gallium/drivers/softpipe/sp_context.c          |    2 +-
 src/gallium/drivers/softpipe/sp_flush.c            |   69 +++++++++----------
 src/gallium/drivers/softpipe/sp_flush.h            |    9 ++-
 src/gallium/drivers/svga/svga_pipe_draw.c          |    2 +-
 src/gallium/drivers/svga/svga_pipe_flush.c         |   33 ++++-----
 src/gallium/drivers/trace/tr_context.c             |    4 +-
 src/gallium/include/pipe/p_context.h               |    4 +-
 src/gallium/include/pipe/p_defines.h               |    9 ---
 src/gallium/include/state_tracker/st_api.h         |    5 ++
 .../state_trackers/d3d1x/dxgi/src/dxgi_native.cpp  |    2 +-
 .../state_trackers/d3d1x/gd3d11/d3d11_context.h    |    2 +-
 .../state_trackers/dri/common/dri_context.c        |    4 +-
 src/gallium/state_trackers/dri/sw/drisw.c          |    2 +-
 .../state_trackers/egl/common/egl_g3d_api.c        |   17 ++---
 .../state_trackers/egl/common/egl_g3d_sync.c       |    2 +-
 .../state_trackers/egl/common/native_helper.c      |    2 +-
 src/gallium/state_trackers/glx/xlib/xm_api.c       |    8 +--
 src/gallium/state_trackers/vega/api_context.c      |    4 +-
 src/gallium/state_trackers/vega/vg_manager.c       |    4 +-
 src/gallium/state_trackers/wgl/stw_context.c       |    8 +--
 src/gallium/state_trackers/xorg/xorg_dri2.c        |    4 +-
 src/gallium/state_trackers/xorg/xorg_driver.c      |    2 +-
 src/gallium/state_trackers/xorg/xorg_exa.c         |    6 +-
 src/gallium/state_trackers/xorg/xorg_exa.h         |    2 +-
 src/gallium/tests/graw/clear.c                     |    2 +-
 src/gallium/tests/graw/fs-test.c                   |    2 +-
 src/gallium/tests/graw/gs-test.c                   |    2 +-
 src/gallium/tests/graw/quad-sample.c               |    2 +-
 src/gallium/tests/graw/quad-tex.c                  |    2 +-
 src/gallium/tests/graw/shader-leak.c               |    2 +-
 src/gallium/tests/graw/tri-gs.c                    |    2 +-
 src/gallium/tests/graw/tri-instanced.c             |    2 +-
 src/gallium/tests/graw/tri.c                       |    2 +-
 src/gallium/tests/graw/vs-test.c                   |    2 +-
 src/gallium/tests/trivial/quad-tex.c               |    2 +-
 src/gallium/tests/trivial/tri.c                    |    2 +-
 src/gallium/winsys/r600/drm/r600_bo.c              |    2 +-
 src/gallium/winsys/sw/wrapper/wrapper_sw_winsys.c  |    2 +-
 src/mesa/state_tracker/st_cb_flush.c               |    8 +-
 src/mesa/state_tracker/st_cb_flush.h               |    2 +-
 src/mesa/state_tracker/st_cb_syncobj.c             |    2 +-
 src/mesa/state_tracker/st_manager.c                |    4 +-
 69 files changed, 169 insertions(+), 215 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=7e02303497237cde958c28608477d0c355a8038b



More information about the mesa-commit mailing list