KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/u_blit: don't do two copies for non-2D textures 

Because u_blit couldn't sample a 1D, 3D, CUBE and ARRAY texture, we created
a 2D texture holding a copy of one slice of the source texture (even for 1D).

Let's just do it right.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2012-07-08 16:02:41 +02:00
parent 2dca61bcb3
commit 3f13b5da15
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/gallium/auxiliary/util/u_blit.c
View File

@ -66,8 +66,8 @@ struct blit_state
enum pipe_texture_target internal_target; enum pipe_texture_target internal_target;
void *vs; void *vs;
void *fs[TGSI_WRITEMASK_XYZW + 1]; void *fs[PIPE_MAX_TEXTURE_TYPES][TGSI_WRITEMASK_XYZW + 1];
void *fs_depth; void *fs_depth[PIPE_MAX_TEXTURE_TYPES];
struct pipe_resource *vbuf; /**< quad vertices */ struct pipe_resource *vbuf; /**< quad vertices */
unsigned vbuf_slot; unsigned vbuf_slot;
@ -153,17 +153,23 @@ void
util_destroy_blit(struct blit_state *ctx) util_destroy_blit(struct blit_state *ctx)
{ {
struct pipe_context *pipe = ctx->pipe; struct pipe_context *pipe = ctx->pipe;
unsigned i; unsigned i, j;
if (ctx->vs) if (ctx->vs)
pipe->delete_vs_state(pipe, ctx->vs); pipe->delete_vs_state(pipe, ctx->vs);
for (i = 0; i < Elements(ctx->fs); i++) for (i = 0; i < Elements(ctx->fs); i++) {
if (ctx->fs[i]) for (j = 0; j < Elements(ctx->fs[i]); j++) {
pipe->delete_fs_state(pipe, ctx->fs[i]); if (ctx->fs[i][j])
pipe->delete_fs_state(pipe, ctx->fs[i][j]);
}
}
if (ctx->fs_depth) for (i = 0; i < Elements(ctx->fs_depth); i++) {
pipe->delete_fs_state(pipe, ctx->fs_depth); if (ctx->fs_depth[i]) {
pipe->delete_fs_state(pipe, ctx->fs_depth[i]);
}
}
pipe_resource_reference(&ctx->vbuf, NULL); pipe_resource_reference(&ctx->vbuf, NULL);
@ -175,15 +181,19 @@ util_destroy_blit(struct blit_state *ctx)
* Helper function to set the fragment shaders. * Helper function to set the fragment shaders.
*/ */
static INLINE void static INLINE void
set_fragment_shader(struct blit_state *ctx, uint writemask) set_fragment_shader(struct blit_state *ctx, uint writemask,
enum pipe_texture_target pipe_tex)
{ {
if (!ctx->fs[writemask]) if (!ctx->fs[pipe_tex][writemask]) {
ctx->fs[writemask] = unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex);
util_make_fragment_tex_shader_writemask(ctx->pipe, TGSI_TEXTURE_2D,
ctx->fs[pipe_tex][writemask] =
util_make_fragment_tex_shader_writemask(ctx->pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR, TGSI_INTERPOLATE_LINEAR,
writemask); writemask);
}
cso_set_fragment_shader_handle(ctx->cso, ctx->fs[writemask]); cso_set_fragment_shader_handle(ctx->cso, ctx->fs[pipe_tex][writemask]);
} }
@ -191,14 +201,18 @@ set_fragment_shader(struct blit_state *ctx, uint writemask)
* Helper function to set the depthwrite shader. * Helper function to set the depthwrite shader.
*/ */
static INLINE void static INLINE void
set_depth_fragment_shader(struct blit_state *ctx) set_depth_fragment_shader(struct blit_state *ctx,
enum pipe_texture_target pipe_tex)
{ {
if (!ctx->fs_depth) if (!ctx->fs_depth[pipe_tex]) {
ctx->fs_depth = unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(pipe_tex);
util_make_fragment_tex_shader_writedepth(ctx->pipe, TGSI_TEXTURE_2D,
TGSI_INTERPOLATE_LINEAR);
cso_set_fragment_shader_handle(ctx->cso, ctx->fs_depth); ctx->fs_depth[pipe_tex] =
util_make_fragment_tex_shader_writedepth(ctx->pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR);
}
cso_set_fragment_shader_handle(ctx->cso, ctx->fs_depth[pipe_tex]);
} }
@ -430,20 +444,11 @@ util_blit_pixels_writemask(struct blit_state *ctx,
dst_surface = pipe->create_surface(pipe, dst->texture, &templ); dst_surface = pipe->create_surface(pipe, dst->texture, &templ);
} }
/* Create a temporary texture when src and dest alias or when src /* Create a temporary texture when src and dest alias.
* is anything other than a 2d texture.
* XXX should just use appropriate shader to access 1d / 3d slice / cube face,
* much like the u_blitter code does (should be pretty trivial).
*
* This can still be improved upon.
*/ */
if ((src_tex == dst_surface->texture && if (src_tex == dst_surface->texture &&
dst_surface->u.tex.level == src_level && dst_surface->u.tex.level == src_level &&
dst_surface->u.tex.first_layer == srcZ0) || dst_surface->u.tex.first_layer == srcZ0) {
(src_tex->target != PIPE_TEXTURE_2D &&
src_tex->target != PIPE_TEXTURE_2D &&
src_tex->target != PIPE_TEXTURE_RECT))
{
/* Make a temporary texture which contains a copy of the source pixels. /* Make a temporary texture which contains a copy of the source pixels.
* Then we'll sample from the temporary texture. * Then we'll sample from the temporary texture.
*/ */
@ -598,9 +603,9 @@ util_blit_pixels_writemask(struct blit_state *ctx,
/* shaders */ /* shaders */
if (dst_is_depth) { if (dst_is_depth) {
set_depth_fragment_shader(ctx); set_depth_fragment_shader(ctx, sampler_view->texture->target);
} else { } else {
set_fragment_shader(ctx, writemask); set_fragment_shader(ctx, writemask, sampler_view->texture->target);
} }
set_vertex_shader(ctx); set_vertex_shader(ctx);
cso_set_geometry_shader_handle(ctx->cso, NULL); cso_set_geometry_shader_handle(ctx->cso, NULL);
@ -775,7 +780,8 @@ util_blit_pixels_tex(struct blit_state *ctx,
cso_set_fragment_sampler_views(ctx->cso, 1, &src_sampler_view); cso_set_fragment_sampler_views(ctx->cso, 1, &src_sampler_view);
/* shaders */ /* shaders */
set_fragment_shader(ctx, TGSI_WRITEMASK_XYZW); set_fragment_shader(ctx, TGSI_WRITEMASK_XYZW,
src_sampler_view->texture->target);
set_vertex_shader(ctx); set_vertex_shader(ctx);
cso_set_geometry_shader_handle(ctx->cso, NULL); cso_set_geometry_shader_handle(ctx->cso, NULL);