fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 19:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno: cleanup fd_set_sampler_views

Browse source 
The separate FS/VS entrypoints are no longer used since a3ed98f.  So
just inline them.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Rob Clark 2016-04-19 15:52:18 -04:00
parent fadfaa82c6
commit d4ff42bd0a
1 changed files with 27 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/gallium/drivers/freedreno/freedreno_texture.c
View file

@ -110,49 +110,36 @@ fd_sampler_states_bind(struct pipe_context *pctx,
}
}
static void
fd_fragtex_set_sampler_views(struct pipe_context *pctx, unsigned nr,
struct pipe_sampler_view **views)
{
struct fd_context *ctx = fd_context(pctx);
/* on a2xx, since there is a flat address space for textures/samplers,
* a change in # of fragment textures/samplers will trigger patching and
* re-emitting the vertex shader:
*/
if (nr != ctx->fragtex.num_textures)
ctx->dirty |= FD_DIRTY_TEXSTATE;
set_sampler_views(&ctx->fragtex, nr, views);
ctx->dirty |= FD_DIRTY_FRAGTEX;
}
static void
fd_verttex_set_sampler_views(struct pipe_context *pctx, unsigned nr,
struct pipe_sampler_view **views)
{
struct fd_context *ctx = fd_context(pctx);
set_sampler_views(&ctx->verttex, nr, views);
ctx->dirty |= FD_DIRTY_VERTTEX;
}
void
fd_set_sampler_views(struct pipe_context *pctx, unsigned shader,
unsigned start, unsigned nr,
struct pipe_sampler_view **views)
unsigned start, unsigned nr,
struct pipe_sampler_view **views)
{
assert(start == 0);
switch (shader) {
case PIPE_SHADER_FRAGMENT:
fd_fragtex_set_sampler_views(pctx, nr, views);
break;
case PIPE_SHADER_VERTEX:
fd_verttex_set_sampler_views(pctx, nr, views);
break;
default:
;
}
struct fd_context *ctx = fd_context(pctx);
assert(start == 0);
switch (shader) {
case PIPE_SHADER_FRAGMENT:
/* on a2xx, since there is a flat address space for textures/samplers,
* a change in # of fragment textures/samplers will trigger patching
* and re-emitting the vertex shader:
*
* (note: later gen's ignore FD_DIRTY_TEXSTATE so fine to set it)
*/
if (nr != ctx->fragtex.num_textures)
ctx->dirty |= FD_DIRTY_TEXSTATE;
set_sampler_views(&ctx->fragtex, nr, views);
ctx->dirty |= FD_DIRTY_FRAGTEX;
break;
case PIPE_SHADER_VERTEX:
set_sampler_views(&ctx->verttex, nr, views);
ctx->dirty |= FD_DIRTY_VERTTEX;
break;
default:
break;
}
}
void