diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:14:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:31:08 +1000 |
| commit | d1a9b1f513109c975a5a7ed5a2d0c329b280afe4 (patch) | |
| tree | 5c85af47b4f5af0661acf129e3ce3f59e43cbfd9 /src/gallium/drivers/i915simple/i915_clear.c | |
| parent | 90ffce497395d8c02fee2ea4ee4c025eede3d876 (diff) | |
| parent | 8648c2685870174cf620ef15de70ef030a8d5a20 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_clear.c')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_clear.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/i915simple/i915_clear.c b/src/gallium/drivers/i915simple/i915_clear.c index 8a2d3ca43f..90530f2826 100644 --- a/src/gallium/drivers/i915simple/i915_clear.c +++ b/src/gallium/drivers/i915simple/i915_clear.c @@ -25,24 +25,24 @@ * **************************************************************************/ -/* Author: +/* Authors: * Brian Paul */ -#include "pipe/p_defines.h" +#include "util/u_clear.h" #include "i915_context.h" #include "i915_state.h" /** - * Clear the given surface to the specified value. + * Clear the given buffers to the specified values. * No masking, no scissor (clear entire buffer). */ void -i915_clear(struct pipe_context *pipe, struct pipe_surface *ps, - unsigned clearValue) +i915_clear(struct pipe_context *pipe, unsigned buffers, const float *rgba, + double depth, unsigned stencil) { - pipe->surface_fill(pipe, ps, 0, 0, ps->width, ps->height, clearValue); - ps->status = PIPE_SURFACE_STATUS_DEFINED; + util_clear(pipe, &i915_context(pipe)->framebuffer, buffers, rgba, depth, + stencil); } |