diff options
Diffstat (limited to 'src/gallium/drivers/nvfx')
-rw-r--r-- | src/gallium/drivers/nvfx/nvfx_clear.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/nvfx/nvfx_context.h | 3 | ||||
-rw-r--r-- | src/gallium/drivers/nvfx/nvfx_surface.c | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_clear.c b/src/gallium/drivers/nvfx/nvfx_clear.c index 2be70fcee40..46f23e38260 100644 --- a/src/gallium/drivers/nvfx/nvfx_clear.c +++ b/src/gallium/drivers/nvfx/nvfx_clear.c @@ -7,8 +7,8 @@ void nvfx_clear(struct pipe_context *pipe, unsigned buffers, - const float *rgba, double depth, unsigned stencil) + const union pipe_color_union *color, double depth, unsigned stencil) { - util_clear(pipe, &nvfx_context(pipe)->framebuffer, buffers, rgba, depth, + util_clear(pipe, &nvfx_context(pipe)->framebuffer, buffers, color, depth, stencil); } diff --git a/src/gallium/drivers/nvfx/nvfx_context.h b/src/gallium/drivers/nvfx/nvfx_context.h index cb40a521d1b..3d05ecc7807 100644 --- a/src/gallium/drivers/nvfx/nvfx_context.h +++ b/src/gallium/drivers/nvfx/nvfx_context.h @@ -238,7 +238,8 @@ nvfx_create(struct pipe_screen *pscreen, void *priv); /* nvfx_clear.c */ extern void nvfx_clear(struct pipe_context *pipe, unsigned buffers, - const float *rgba, double depth, unsigned stencil); + const union pipe_color_union *color, + double depth, unsigned stencil); /* nvfx_draw.c */ extern struct draw_stage *nvfx_draw_render_stage(struct nvfx_context *nvfx); diff --git a/src/gallium/drivers/nvfx/nvfx_surface.c b/src/gallium/drivers/nvfx/nvfx_surface.c index 91ca1c3750e..d489bbf9473 100644 --- a/src/gallium/drivers/nvfx/nvfx_surface.c +++ b/src/gallium/drivers/nvfx/nvfx_surface.c @@ -478,19 +478,19 @@ nvfx_surface_flush(struct pipe_context* pipe, struct pipe_surface* surf) static void nvfx_clear_render_target(struct pipe_context *pipe, struct pipe_surface *dst, - const float *rgba, + const union pipe_color_union *color, unsigned dstx, unsigned dsty, unsigned width, unsigned height) { union util_color uc; - util_pack_color(rgba, dst->format, &uc); + util_pack_color(color->f, dst->format, &uc); if(util_format_get_blocksizebits(dst->format) > 32 || nvfx_surface_fill(pipe, dst, dstx, dsty, width, height, uc.ui)) { // TODO: probably should use hardware clear here instead if possible struct blitter_context* blitter = nvfx_get_blitter(pipe, 0); - util_blitter_clear_render_target(blitter, dst, rgba, dstx, dsty, width, height); + util_blitter_clear_render_target(blitter, dst, color, dstx, dsty, width, height); nvfx_put_blitter(pipe, blitter); } } |