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

gallium: pass the filter mode to util_gen_mipmap(). 

Remove util_gen_mipmap_filter() when no longer used.
This commit is contained in:
Brian 2008-03-24 08:53:16 -06:00
parent c8c373514a
commit 110b63d00f
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gallium/auxiliary/util/u_gen_mipmap.c
View File

@ -719,7 +719,6 @@ util_create_gen_mipmap(struct pipe_context *pipe,
ctx->sampler.wrap_t = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
ctx->sampler.wrap_r = PIPE_TEX_WRAP_CLAMP_TO_EDGE;
ctx->sampler.min_mip_filter = PIPE_TEX_MIPFILTER_NEAREST;
ctx->sampler.mag_img_filter = PIPE_TEX_FILTER_LINEAR;
ctx->sampler.normalized_coords = 1;
@ -849,11 +848,12 @@ simple_viewport(struct pipe_context *pipe, uint width, uint height)
* \param baseLevel the first mipmap level to use as a src
* \param lastLevel the last mipmap level to generate
* \param filter the minification filter used to generate mipmap levels with
* \param filter one of PIPE_TEX_FILTER_LINEAR, PIPE_TEX_FILTER_NEAREST
*/
void
util_gen_mipmap_filter(struct gen_mipmap_state *ctx,
struct pipe_texture *pt,
uint face, uint baseLevel, uint lastLevel, uint filter)
util_gen_mipmap(struct gen_mipmap_state *ctx,
struct pipe_texture *pt,
uint face, uint baseLevel, uint lastLevel, uint filter)
{
struct pipe_context *pipe = ctx->pipe;
struct pipe_screen *screen = pipe->screen;
@ -914,6 +914,7 @@ util_gen_mipmap_filter(struct gen_mipmap_state *ctx,
*/
ctx->sampler.min_lod = ctx->sampler.max_lod = (float) srcLevel;
ctx->sampler.lod_bias = (float) srcLevel;
ctx->sampler.mag_img_filter = filter;
ctx->sampler.min_img_filter = filter;
cso_single_sampler(ctx->cso, 0, &ctx->sampler);
cso_single_sampler_done(ctx->cso);
@ -949,18 +950,12 @@ util_gen_mipmap_filter(struct gen_mipmap_state *ctx,
/**
* Generate mipmap images with a linear minification filter.
* See util_gen_mipmap_filter for more info.
*
* \param pt the texture to generate mipmap levels for
* \param face which cube face to generate mipmaps for (0 for non-cube maps)
* \param baseLevel the first mipmap level to use as a src
* \param lastLevel the last mipmap level to generate
* XXX remove this
*/
void
util_gen_mipmap(struct gen_mipmap_state *ctx,
struct pipe_texture *pt,
uint face, uint baseLevel, uint lastLevel)
util_gen_mipmap_filter(struct gen_mipmap_state *ctx,
struct pipe_texture *pt,
uint face, uint baseLevel, uint lastLevel, uint filter)
{
util_gen_mipmap_filter( ctx, pt, face, baseLevel, lastLevel, PIPE_TEX_FILTER_LINEAR );
util_gen_mipmap_filter( ctx, pt, face, baseLevel, lastLevel, filter );
}

2
src/gallium/auxiliary/util/u_gen_mipmap.h
View File

@ -50,7 +50,7 @@ util_destroy_gen_mipmap(struct gen_mipmap_state *ctx);
extern void
util_gen_mipmap(struct gen_mipmap_state *ctx,
struct pipe_texture *pt,
uint face, uint baseLevel, uint lastLevel);
uint face, uint baseLevel, uint lastLevel, uint filter);
extern void
util_gen_mipmap_filter(struct gen_mipmap_state *ctx,

3
src/mesa/state_tracker/st_gen_mipmap.c
View File

@ -92,7 +92,8 @@ st_render_mipmap(struct st_context *st,
return FALSE;
}
util_gen_mipmap(st->gen_mipmap, pt, face, baseLevel, lastLevel);
util_gen_mipmap(st->gen_mipmap, pt, face, baseLevel, lastLevel,
PIPE_TEX_FILTER_LINEAR);
/* shaders don't go through CSO yet */
if (st->fp)