fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/util: add _LZ and TXF options to simple shaders

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-05-30 19:24:17 +02:00
parent 20c2785f7c
commit eedca3323e
6 changed files with 77 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/auxiliary/util/u_blit.c
View file

@ -186,7 +186,7 @@ set_fragment_shader(struct blit_state *ctx, uint writemask,
util_make_fragment_tex_shader_writemask(ctx->pipe, tgsi_tex, util_make_fragment_tex_shader_writemask(ctx->pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR, TGSI_INTERPOLATE_LINEAR,
writemask, writemask,
stype, stype); stype, stype, false, false);
} }
cso_set_fragment_shader_handle(ctx->cso, ctx->fs[pipe_tex][writemask][idx]); cso_set_fragment_shader_handle(ctx->cso, ctx->fs[pipe_tex][writemask][idx]);

13
src/gallium/auxiliary/util/u_blitter.c
View file

@ -952,7 +952,8 @@ static void *blitter_get_fs_texfetch_col(struct blitter_context_priv *ctx,
assert(!ctx->cached_all_shaders); assert(!ctx->cached_all_shaders);
*shader = util_make_fragment_tex_shader(pipe, tgsi_tex, *shader = util_make_fragment_tex_shader(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR, TGSI_INTERPOLATE_LINEAR,
stype, dtype); stype, dtype,
false, false);
} }
return *shader; return *shader;
@ -990,7 +991,8 @@ void *blitter_get_fs_texfetch_depth(struct blitter_context_priv *ctx,
tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0); tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
*shader = *shader =
util_make_fragment_tex_shader_writedepth(pipe, tgsi_tex, util_make_fragment_tex_shader_writedepth(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR); TGSI_INTERPOLATE_LINEAR,
false, false);
} }
return *shader; return *shader;
@ -1028,7 +1030,9 @@ void *blitter_get_fs_texfetch_depthstencil(struct blitter_context_priv *ctx,
tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0); tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
*shader = *shader =
util_make_fragment_tex_shader_writedepthstencil(pipe, tgsi_tex, util_make_fragment_tex_shader_writedepthstencil(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR); TGSI_INTERPOLATE_LINEAR,
false,
false);
} }
return *shader; return *shader;
@ -1066,7 +1070,8 @@ void *blitter_get_fs_texfetch_stencil(struct blitter_context_priv *ctx,
tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0); tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
*shader = *shader =
util_make_fragment_tex_shader_writestencil(pipe, tgsi_tex, util_make_fragment_tex_shader_writestencil(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR); TGSI_INTERPOLATE_LINEAR,
false, false);
} }
return *shader; return *shader;

70
src/gallium/auxiliary/util/u_simple_shaders.c
View file

@ -205,6 +205,28 @@ void *util_make_layered_clear_geometry_shader(struct pipe_context *pipe)
return pipe->create_gs_state(pipe, &state); return pipe->create_gs_state(pipe, &state);
} }
static void
ureg_load_tex(struct ureg_program *ureg, struct ureg_dst out,
struct ureg_src coord, struct ureg_src sampler,
unsigned tex_target, bool load_level_zero, bool use_txf)
{
if (use_txf) {
struct ureg_dst temp = ureg_DECL_temporary(ureg);
ureg_F2I(ureg, temp, coord);
if (load_level_zero)
ureg_TXF_LZ(ureg, out, tex_target, ureg_src(temp), sampler);
else
ureg_TXF(ureg, out, tex_target, ureg_src(temp), sampler);
} else {
if (load_level_zero)
ureg_TEX_LZ(ureg, out, tex_target, coord, sampler);
else
ureg_TEX(ureg, out, tex_target, coord, sampler);
}
}
/** /**
* Make simple fragment texture shader: * Make simple fragment texture shader:
* IMM {0,0,0,1} // (if writemask != 0xf) * IMM {0,0,0,1} // (if writemask != 0xf)
@ -224,7 +246,9 @@ util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
unsigned interp_mode, unsigned interp_mode,
unsigned writemask, unsigned writemask,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype) enum tgsi_return_type dtype,
bool load_level_zero,
bool use_txf)
{ {
struct ureg_program *ureg; struct ureg_program *ureg;
struct ureg_src sampler; struct ureg_src sampler;
@ -265,9 +289,8 @@ util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
ureg_writemask(temp, writemask), ureg_writemask(temp, writemask),
tex_target, tex, sampler); tex_target, tex, sampler);
else else
ureg_TEX(ureg, ureg_load_tex(ureg, ureg_writemask(temp, writemask), tex, sampler,
ureg_writemask(temp, writemask), tex_target, load_level_zero, use_txf);
tex_target, tex, sampler);
if (stype != dtype) { if (stype != dtype) {
if (stype == TGSI_RETURN_TYPE_SINT) { if (stype == TGSI_RETURN_TYPE_SINT) {
@ -299,13 +322,16 @@ void *
util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target, util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target,
unsigned interp_mode, unsigned interp_mode,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype) enum tgsi_return_type dtype,
bool load_level_zero,
bool use_txf)
{ {
return util_make_fragment_tex_shader_writemask( pipe, return util_make_fragment_tex_shader_writemask( pipe,
tex_target, tex_target,
interp_mode, interp_mode,
TGSI_WRITEMASK_XYZW, TGSI_WRITEMASK_XYZW,
stype, dtype ); stype, dtype, load_level_zero,
use_txf);
} }
@ -316,7 +342,9 @@ util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target,
void * void *
util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
unsigned tex_target, unsigned tex_target,
unsigned interp_mode) unsigned interp_mode,
bool load_level_zero,
bool use_txf)
{ {
struct ureg_program *ureg; struct ureg_program *ureg;
struct ureg_src sampler; struct ureg_src sampler;
@ -352,9 +380,8 @@ util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
ureg_MOV( ureg, out, imm ); ureg_MOV( ureg, out, imm );
ureg_TEX( ureg, ureg_load_tex(ureg, ureg_writemask(depth, TGSI_WRITEMASK_Z), tex, sampler,
ureg_writemask(depth, TGSI_WRITEMASK_Z), tex_target, load_level_zero, use_txf);
tex_target, tex, sampler );
ureg_END( ureg ); ureg_END( ureg );
return ureg_create_shader_and_destroy( ureg, pipe ); return ureg_create_shader_and_destroy( ureg, pipe );
@ -368,7 +395,9 @@ util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
void * void *
util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
unsigned tex_target, unsigned tex_target,
unsigned interp_mode) unsigned interp_mode,
bool load_level_zero,
bool use_txf)
{ {
struct ureg_program *ureg; struct ureg_program *ureg;
struct ureg_src depth_sampler, stencil_sampler; struct ureg_src depth_sampler, stencil_sampler;
@ -413,12 +442,10 @@ util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
ureg_MOV( ureg, out, imm ); ureg_MOV( ureg, out, imm );
ureg_TEX( ureg, ureg_load_tex(ureg, ureg_writemask(depth, TGSI_WRITEMASK_Z), tex,
ureg_writemask(depth, TGSI_WRITEMASK_Z), depth_sampler, tex_target, load_level_zero, use_txf);
tex_target, tex, depth_sampler ); ureg_load_tex(ureg, ureg_writemask(stencil, TGSI_WRITEMASK_Y), tex,
ureg_TEX( ureg, stencil_sampler, tex_target, load_level_zero, use_txf);
ureg_writemask(stencil, TGSI_WRITEMASK_Y),
tex_target, tex, stencil_sampler );
ureg_END( ureg ); ureg_END( ureg );
return ureg_create_shader_and_destroy( ureg, pipe ); return ureg_create_shader_and_destroy( ureg, pipe );
@ -432,7 +459,9 @@ util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
void * void *
util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe,
unsigned tex_target, unsigned tex_target,
unsigned interp_mode) unsigned interp_mode,
bool load_level_zero,
bool use_txf)
{ {
struct ureg_program *ureg; struct ureg_program *ureg;
struct ureg_src stencil_sampler; struct ureg_src stencil_sampler;
@ -468,9 +497,8 @@ util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe,
ureg_MOV( ureg, out, imm ); ureg_MOV( ureg, out, imm );
ureg_TEX( ureg, ureg_load_tex(ureg, ureg_writemask(stencil, TGSI_WRITEMASK_Y), tex,
ureg_writemask(stencil, TGSI_WRITEMASK_Y), stencil_sampler, tex_target, load_level_zero, use_txf);
tex_target, tex, stencil_sampler );
ureg_END( ureg ); ureg_END( ureg );
return ureg_create_shader_and_destroy( ureg, pipe ); return ureg_create_shader_and_destroy( ureg, pipe );

20
src/gallium/auxiliary/util/u_simple_shaders.h
View file

@ -74,30 +74,40 @@ util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
unsigned interp_mode, unsigned interp_mode,
unsigned writemask, unsigned writemask,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype); enum tgsi_return_type dtype,
bool load_level_zero,
bool use_txf);
extern void * extern void *
util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target, util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target,
unsigned interp_mode, unsigned interp_mode,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype); enum tgsi_return_type dtype,
bool load_level_zero,
bool use_txf);
extern void * extern void *
util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
unsigned tex_target, unsigned tex_target,
unsigned interp_mode); unsigned interp_mode,
bool load_level_zero,
bool use_txf);
extern void * extern void *
util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
unsigned tex_target, unsigned tex_target,
unsigned interp_mode); unsigned interp_mode,
bool load_level_zero,
bool use_txf);
extern void * extern void *
util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe,
unsigned tex_target, unsigned tex_target,
unsigned interp_mode); unsigned interp_mode,
bool load_level_zero,
bool use_txf);
extern void * extern void *

2
src/gallium/auxiliary/util/u_tests.c
View file

@ -375,7 +375,7 @@ null_sampler_view(struct pipe_context *ctx, unsigned tgsi_tex_target)
fs = util_make_fragment_tex_shader(ctx, tgsi_tex_target, fs = util_make_fragment_tex_shader(ctx, tgsi_tex_target,
TGSI_INTERPOLATE_LINEAR, TGSI_INTERPOLATE_LINEAR,
TGSI_RETURN_TYPE_FLOAT, TGSI_RETURN_TYPE_FLOAT,
TGSI_RETURN_TYPE_FLOAT); TGSI_RETURN_TYPE_FLOAT, false, false);
cso_set_fragment_shader_handle(cso, fs); cso_set_fragment_shader_handle(cso, fs);
/* Vertex shader. */ /* Vertex shader. */

3
src/gallium/tests/trivial/quad-tex.c
View file

@ -273,7 +273,8 @@ static void init_prog(struct program *p)
p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D, p->fs = util_make_fragment_tex_shader(p->pipe, TGSI_TEXTURE_2D,
TGSI_INTERPOLATE_LINEAR, TGSI_INTERPOLATE_LINEAR,
TGSI_RETURN_TYPE_FLOAT, TGSI_RETURN_TYPE_FLOAT,
TGSI_RETURN_TYPE_FLOAT); TGSI_RETURN_TYPE_FLOAT, false,
false);
} }
static void close_prog(struct program *p) static void close_prog(struct program *p)