u_blitter: rename util_blitter_copy_region -> util_blitter_copy_texture
This commit is contained in:
parent
a77431b3b0
commit
233dd4953e
|
@ -724,14 +724,14 @@ boolean is_overlap(unsigned sx1, unsigned sx2, unsigned sy1, unsigned sy2,
|
||||||
return sx1 < dx2 && sx2 > dx1 && sy1 < dy2 && sy2 > dy1;
|
return sx1 < dx2 && sx2 > dx1 && sy1 < dy2 && sy2 > dy1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void util_blitter_copy_region(struct blitter_context *blitter,
|
void util_blitter_copy_texture(struct blitter_context *blitter,
|
||||||
struct pipe_resource *dst,
|
struct pipe_resource *dst,
|
||||||
unsigned dstlevel,
|
unsigned dstlevel,
|
||||||
unsigned dstx, unsigned dsty, unsigned dstz,
|
unsigned dstx, unsigned dsty, unsigned dstz,
|
||||||
struct pipe_resource *src,
|
struct pipe_resource *src,
|
||||||
unsigned srclevel,
|
unsigned srclevel,
|
||||||
const struct pipe_box *srcbox,
|
const struct pipe_box *srcbox,
|
||||||
boolean ignore_stencil)
|
boolean ignore_stencil)
|
||||||
{
|
{
|
||||||
struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
|
struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
|
||||||
struct pipe_context *pipe = ctx->base.pipe;
|
struct pipe_context *pipe = ctx->base.pipe;
|
||||||
|
|
|
@ -126,12 +126,15 @@ struct pipe_context *util_blitter_get_pipe(struct blitter_context *blitter)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* These CSOs must be saved before any of the following functions is called:
|
* These states must be saved before any of the following functions is called:
|
||||||
* - blend state
|
* - blend state
|
||||||
* - depth stencil alpha state
|
* - depth stencil alpha state
|
||||||
* - rasterizer state
|
* - rasterizer state
|
||||||
* - vertex shader
|
* - vertex shader
|
||||||
|
* - any other shader??? (XXX)
|
||||||
* - fragment shader
|
* - fragment shader
|
||||||
|
* - vertex buffers
|
||||||
|
* - vertex elements
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -169,14 +172,14 @@ void util_blitter_clear_depth_custom(struct blitter_context *blitter,
|
||||||
* - fragment sampler states
|
* - fragment sampler states
|
||||||
* - fragment sampler textures
|
* - fragment sampler textures
|
||||||
*/
|
*/
|
||||||
void util_blitter_copy_region(struct blitter_context *blitter,
|
void util_blitter_copy_texture(struct blitter_context *blitter,
|
||||||
struct pipe_resource *dst,
|
struct pipe_resource *dst,
|
||||||
unsigned dstlevel,
|
unsigned dstlevel,
|
||||||
unsigned dstx, unsigned dsty, unsigned dstz,
|
unsigned dstx, unsigned dsty, unsigned dstz,
|
||||||
struct pipe_resource *src,
|
struct pipe_resource *src,
|
||||||
unsigned srclevel,
|
unsigned srclevel,
|
||||||
const struct pipe_box *srcbox,
|
const struct pipe_box *srcbox,
|
||||||
boolean ignore_stencil);
|
boolean ignore_stencil);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear a region of a (color) surface to a constant value.
|
* Clear a region of a (color) surface to a constant value.
|
||||||
|
|
|
@ -80,7 +80,7 @@ i915_surface_copy_render(struct pipe_context *pipe,
|
||||||
i915->saved_nr_sampler_views,
|
i915->saved_nr_sampler_views,
|
||||||
i915->saved_sampler_views);
|
i915->saved_sampler_views);
|
||||||
|
|
||||||
util_blitter_copy_region(i915->blitter, dst, dst_level, dstx, dsty, dstz,
|
util_blitter_copy_texture(i915->blitter, dst, dst_level, dstx, dsty, dstz,
|
||||||
src, src_level, src_box, TRUE);
|
src, src_level, src_box, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -288,7 +288,7 @@ nvfx_resource_copy_region(struct pipe_context *pipe,
|
||||||
* TODO: perhaps support reinterpreting the formats
|
* TODO: perhaps support reinterpreting the formats
|
||||||
*/
|
*/
|
||||||
struct blitter_context* blitter = nvfx_get_blitter(pipe, 1);
|
struct blitter_context* blitter = nvfx_get_blitter(pipe, 1);
|
||||||
util_blitter_copy_region(blitter, dstr, dst_level, dstx, dsty, dstz, srcr, src_level, src_box, TRUE);
|
util_blitter_copy_texture(blitter, dstr, dst_level, dstx, dsty, dstz, srcr, src_level, src_box, TRUE);
|
||||||
nvfx_put_blitter(pipe, blitter);
|
nvfx_put_blitter(pipe, blitter);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -445,8 +445,8 @@ static void r300_hw_copy_region(struct pipe_context* pipe,
|
||||||
struct r300_context* r300 = r300_context(pipe);
|
struct r300_context* r300 = r300_context(pipe);
|
||||||
|
|
||||||
r300_blitter_begin(r300, R300_COPY);
|
r300_blitter_begin(r300, R300_COPY);
|
||||||
util_blitter_copy_region(r300->blitter, dst, dst_level, dstx, dsty, dstz,
|
util_blitter_copy_texture(r300->blitter, dst, dst_level, dstx, dsty, dstz,
|
||||||
src, src_level, src_box, TRUE);
|
src, src_level, src_box, TRUE);
|
||||||
r300_blitter_end(r300);
|
r300_blitter_end(r300);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -233,8 +233,8 @@ static void r600_hw_copy_region(struct pipe_context *ctx,
|
||||||
struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
|
struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
|
||||||
|
|
||||||
r600_blitter_begin(ctx, R600_COPY);
|
r600_blitter_begin(ctx, R600_COPY);
|
||||||
util_blitter_copy_region(rctx->blitter, dst, dst_level, dstx, dsty, dstz,
|
util_blitter_copy_texture(rctx->blitter, dst, dst_level, dstx, dsty, dstz,
|
||||||
src, src_level, src_box, TRUE);
|
src, src_level, src_box, TRUE);
|
||||||
r600_blitter_end(ctx);
|
r600_blitter_end(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue