Mesa (master): gallium: move clear paths from rgba to a pointer to a color union (v2)

Dave Airlie airlied at kemper.freedesktop.org
Sun Sep 18 14:13:06 UTC 2011


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

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Sep 16 09:39:34 2011 +0100

gallium: move clear paths from rgba to a pointer to a color union (v2)

This moves the gallium interface for clears from using a pointer to 4 floats to a pointer to a union of float/unsigned/int values.

Notes:
1. the value is opaque.
2. only when the value is used should it be interpretered according to
the surface format it is going to be used with.
3. float clears on integer buffers and vice-versa are undefined.

v2: fixed up vega and graw, dropped hunks that shouldn't have been in
patch.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/auxiliary/postprocess/pp_mlaa.c        |    2 +-
 src/gallium/auxiliary/postprocess/pp_program.h     |    2 +-
 src/gallium/auxiliary/postprocess/pp_run.c         |    2 +-
 src/gallium/auxiliary/util/u_blitter.c             |   44 ++++++++++---------
 src/gallium/auxiliary/util/u_blitter.h             |    6 +-
 src/gallium/auxiliary/util/u_clear.h               |    4 +-
 src/gallium/auxiliary/util/u_surface.c             |    4 +-
 src/gallium/auxiliary/util/u_surface.h             |    2 +-
 src/gallium/auxiliary/vl/vl_compositor.c           |   20 +++------
 src/gallium/auxiliary/vl/vl_compositor.h           |    6 +-
 src/gallium/drivers/cell/ppu/cell_clear.c          |    5 +-
 src/gallium/drivers/cell/ppu/cell_clear.h          |    3 +-
 src/gallium/drivers/galahad/glhd_context.c         |    8 ++--
 src/gallium/drivers/i915/i915_clear.c              |   17 ++++---
 src/gallium/drivers/i915/i915_context.h            |    9 +++-
 src/gallium/drivers/i915/i915_surface.c            |    8 ++--
 src/gallium/drivers/i965/brw_pipe_clear.c          |    8 ++--
 src/gallium/drivers/identity/id_context.c          |    8 ++--
 src/gallium/drivers/llvmpipe/lp_clear.c            |    4 +-
 src/gallium/drivers/llvmpipe/lp_clear.h            |    3 +-
 src/gallium/drivers/noop/noop_pipe.c               |    4 +-
 src/gallium/drivers/nv50/nv50_context.h            |    3 +-
 src/gallium/drivers/nv50/nv50_surface.c            |   21 +++++----
 src/gallium/drivers/nvc0/nvc0_context.h            |    3 +-
 src/gallium/drivers/nvc0/nvc0_surface.c            |   21 +++++----
 src/gallium/drivers/nvfx/nvfx_clear.c              |    4 +-
 src/gallium/drivers/nvfx/nvfx_context.h            |    3 +-
 src/gallium/drivers/nvfx/nvfx_surface.c            |    6 +-
 src/gallium/drivers/r300/r300_blit.c               |   10 ++--
 src/gallium/drivers/r300/r300_render.c             |   20 ++++----
 src/gallium/drivers/r600/r600_blit.c               |   11 +++--
 src/gallium/drivers/rbug/rbug_context.c            |    8 ++--
 src/gallium/drivers/softpipe/sp_clear.c            |    7 ++-
 src/gallium/drivers/softpipe/sp_clear.h            |    3 +-
 src/gallium/drivers/svga/svga_context.h            |    2 +-
 src/gallium/drivers/svga/svga_pipe_clear.c         |   11 +++--
 src/gallium/drivers/trace/tr_context.c             |   14 +++---
 src/gallium/include/pipe/p_context.h               |   10 ++--
 src/gallium/include/pipe/p_defines.h               |    6 +++
 .../state_trackers/d3d1x/dxgi/src/dxgi_native.cpp  |   10 ++--
 .../state_trackers/d3d1x/gd3d11/d3d11_context.h    |    7 +++-
 src/gallium/state_trackers/vdpau/presentation.c    |   16 ++++++-
 src/gallium/state_trackers/vega/api_masks.c        |    7 +++-
 src/gallium/state_trackers/xorg/xorg_exa.c         |    7 +++-
 src/gallium/tests/graw/clear.c                     |    4 +-
 src/gallium/tests/graw/fs-test.c                   |    4 +-
 src/gallium/tests/graw/gs-test.c                   |    4 +-
 src/gallium/tests/graw/quad-sample.c               |    4 +-
 src/gallium/tests/graw/quad-tex.c                  |    4 +-
 src/gallium/tests/graw/shader-leak.c               |    4 +-
 src/gallium/tests/graw/tri-gs.c                    |    4 +-
 src/gallium/tests/graw/tri-instanced.c             |    4 +-
 src/gallium/tests/graw/tri.c                       |    4 +-
 src/gallium/tests/graw/vs-test.c                   |    4 +-
 src/gallium/tests/trivial/quad-tex.c               |   12 +++---
 src/gallium/tests/trivial/tri.c                    |   12 +++---
 src/mesa/state_tracker/st_cb_clear.c               |   22 +++++-----
 57 files changed, 256 insertions(+), 209 deletions(-)

Diff:   http://cgit.freedesktop.org/mesa/mesa/diff/?id=6dd284f7c8fac22f64c13fdf9909094f5ec59086



More information about the mesa-commit mailing list