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

gallium/u_blit: drop not-very-useful wrapper around util_blit_pixels_writemask 

just rename it to util_blit_pixels

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Marek Olšák 2012-07-09 01:20:11 +02:00
parent 3f13b5da15
commit 24e0a26335
6 changed files with 34 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/auxiliary/postprocess/pp_mlaa.c
View File

@ -178,7 +178,8 @@ pp_jimenezmlaa_run(struct pp_queue_t *ppq, struct pipe_resource *in,
/* Blit the input to the output */ /* Blit the input to the output */
util_blit_pixels(p->blitctx, in, 0, 0, 0, util_blit_pixels(p->blitctx, in, 0, 0, 0,
w, h, 0, p->framebuffer.cbufs[0], w, h, 0, p->framebuffer.cbufs[0],
0, 0, w, h, 0, PIPE_TEX_MIPFILTER_NEAREST); 0, 0, w, h, 0, PIPE_TEX_MIPFILTER_NEAREST,
TGSI_WRITEMASK_XYZW);
u_sampler_view_default_template(&v_tmp, in, in->format); u_sampler_view_default_template(&v_tmp, in, in->format);
arr[0] = p->pipe->create_sampler_view(p->pipe, in, &v_tmp); arr[0] = p->pipe->create_sampler_view(p->pipe, in, &v_tmp);

3
src/gallium/auxiliary/postprocess/pp_run.c
View File

@ -59,7 +59,8 @@ pp_run(struct pp_queue_t *ppq, struct pipe_resource *in,
util_blit_pixels(ppq->p->blitctx, in, 0, 0, 0, util_blit_pixels(ppq->p->blitctx, in, 0, 0, 0,
w, h, 0, ppq->tmps[0], w, h, 0, ppq->tmps[0],
0, 0, w, h, 0, PIPE_TEX_MIPFILTER_NEAREST); 0, 0, w, h, 0, PIPE_TEX_MIPFILTER_NEAREST,
TGSI_WRITEMASK_XYZW);
in = ppq->tmp[0]; in = ppq->tmp[0];
} }

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

@ -367,17 +367,17 @@ formats_compatible(enum pipe_format src_format,
* XXX need some control over blitting stencil. * XXX need some control over blitting stencil.
*/ */
void void
util_blit_pixels_writemask(struct blit_state *ctx, util_blit_pixels(struct blit_state *ctx,
struct pipe_resource *src_tex, struct pipe_resource *src_tex,
unsigned src_level, unsigned src_level,
int srcX0, int srcY0, int srcX0, int srcY0,
int srcX1, int srcY1, int srcX1, int srcY1,
int srcZ0, int srcZ0,
struct pipe_surface *dst, struct pipe_surface *dst,
int dstX0, int dstY0, int dstX0, int dstY0,
int dstX1, int dstY1, int dstX1, int dstY1,
float z, uint filter, float z, uint filter,
uint writemask) uint writemask)
{ {
struct pipe_context *pipe = ctx->pipe; struct pipe_context *pipe = ctx->pipe;
struct pipe_screen *screen = pipe->screen; struct pipe_screen *screen = pipe->screen;
@ -660,31 +660,6 @@ util_blit_pixels_writemask(struct blit_state *ctx,
} }
void
util_blit_pixels(struct blit_state *ctx,
struct pipe_resource *src_tex,
unsigned src_level,
int srcX0, int srcY0,
int srcX1, int srcY1,
int srcZ,
struct pipe_surface *dst,
int dstX0, int dstY0,
int dstX1, int dstY1,
float z, uint filter )
{
util_blit_pixels_writemask( ctx, src_tex,
src_level,
srcX0, srcY0,
srcX1, srcY1,
srcZ,
dst,
dstX0, dstY0,
dstX1, dstY1,
z, filter,
TGSI_WRITEMASK_XYZW );
}
/** /**
* Copy pixel block from src texture to dst surface. * Copy pixel block from src texture to dst surface.
* The sampler view's first_level field indicates the source * The sampler view's first_level field indicates the source

18
src/gallium/auxiliary/util/u_blit.h
View File

@ -31,6 +31,8 @@
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
/* for TGSI_WRITEMASK_* specification in util_blit_pixels */
#include "pipe/p_shader_tokens.h"
#ifdef __cplusplus #ifdef __cplusplus
@ -61,20 +63,8 @@ util_blit_pixels(struct blit_state *ctx,
struct pipe_surface *dst, struct pipe_surface *dst,
int dstX0, int dstY0, int dstX0, int dstY0,
int dstX1, int dstY1, int dstX1, int dstY1,
float z, uint filter); float z, uint filter,
uint writemask);
void
util_blit_pixels_writemask(struct blit_state *ctx,
struct pipe_resource *src_tex,
unsigned src_level,
int srcX0, int srcY0,
int srcX1, int srcY1,
int srcZ0,
struct pipe_surface *dst,
int dstX0, int dstY0,
int dstX1, int dstY1,
float z, uint filter,
uint writemask);
extern void extern void
util_blit_pixels_tex(struct blit_state *ctx, util_blit_pixels_tex(struct blit_state *ctx,

8
src/mesa/state_tracker/st_cb_blit.c
View File

@ -242,7 +242,7 @@ st_BlitFramebuffer(struct gl_context *ctx,
srcX0, srcY0, srcX1, srcY1, srcX0, srcY0, srcX1, srcY1,
srcAtt->Zoffset + srcAtt->CubeMapFace, srcAtt->Zoffset + srcAtt->CubeMapFace,
dstSurf, dstX0, dstY0, dstX1, dstY1, dstSurf, dstX0, dstY0, dstX1, dstY1,
0.0, pFilter); 0.0, pFilter, TGSI_WRITEMASK_XYZW);
} }
else { else {
struct st_renderbuffer *srcRb = struct st_renderbuffer *srcRb =
@ -257,7 +257,7 @@ st_BlitFramebuffer(struct gl_context *ctx,
srcX0, srcY0, srcX1, srcY1, srcX0, srcY0, srcX1, srcY1,
srcSurf->u.tex.first_layer, srcSurf->u.tex.first_layer,
dstSurf, dstX0, dstY0, dstX1, dstY1, dstSurf, dstX0, dstY0, dstX1, dstY1,
0.0, pFilter); 0.0, pFilter, TGSI_WRITEMASK_XYZW);
} }
} }
@ -294,7 +294,7 @@ st_BlitFramebuffer(struct gl_context *ctx,
srcX0, srcY0, srcX1, srcY1, srcX0, srcY0, srcX1, srcY1,
srcDepthRb->surface->u.tex.first_layer, srcDepthRb->surface->u.tex.first_layer,
dstDepthSurf, dstX0, dstY0, dstX1, dstY1, dstDepthSurf, dstX0, dstY0, dstX1, dstY1,
0.0, pFilter); 0.0, pFilter, TGSI_WRITEMASK_XYZW);
} }
else { else {
/* blitting depth and stencil separately */ /* blitting depth and stencil separately */
@ -305,7 +305,7 @@ st_BlitFramebuffer(struct gl_context *ctx,
srcX0, srcY0, srcX1, srcY1, srcX0, srcY0, srcX1, srcY1,
srcDepthRb->surface->u.tex.first_layer, srcDepthRb->surface->u.tex.first_layer,
dstDepthSurf, dstX0, dstY0, dstX1, dstY1, dstDepthSurf, dstX0, dstY0, dstX1, dstY1,
0.0, pFilter); 0.0, pFilter, TGSI_WRITEMASK_XYZW);
} }
if (mask & GL_STENCIL_BUFFER_BIT) { if (mask & GL_STENCIL_BUFFER_BIT) {

22
src/mesa/state_tracker/st_cb_texture.c
View File

@ -1066,17 +1066,17 @@ st_CopyTexSubImage(struct gl_context *ctx, GLuint dims,
dest_surface = pipe->create_surface(pipe, stImage->pt, dest_surface = pipe->create_surface(pipe, stImage->pt,
&surf_tmpl); &surf_tmpl);
util_blit_pixels_writemask(st->blit, util_blit_pixels(st->blit,
strb->texture, strb->texture,
strb->surface->u.tex.level, strb->surface->u.tex.level,
srcX, srcY0, srcX, srcY0,
srcX + width, srcY1, srcX + width, srcY1,
strb->surface->u.tex.first_layer, strb->surface->u.tex.first_layer,
dest_surface, dest_surface,
destX, destY, destX, destY,
destX + width, destY + height, destX + width, destY + height,
0.0, PIPE_TEX_MIPFILTER_NEAREST, 0.0, PIPE_TEX_MIPFILTER_NEAREST,
format_writemask); format_writemask);
pipe_surface_reference(&dest_surface, NULL); pipe_surface_reference(&dest_surface, NULL);
/* Restore conditional rendering state. */ /* Restore conditional rendering state. */