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

util: s/PIPE_TEX_MIPFILTER/PIPE_TEX_FILTER/ in u_blit code

Browse source 
PIPE_TEX_MIPFILTER_x is not legal for the pipe_sampler_state::
min/mag_img_filter fields.  But PIPE_TEX_MIPFILTER_x == PIPE_TEX_FILTER_x
so we were getting lucky.

This also makes the code consistent with u_blitter.c.

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Brian Paul 2014-09-15 15:33:26 -06:00
parent f5e8b30472
commit b32f05e153
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -336,7 +336,7 @@ formats_compatible(enum pipe_format src_format,
* Copy pixel block from src surface to dst surface. * Copy pixel block from src surface to dst surface.
* Overlapping regions are acceptable. * Overlapping regions are acceptable.
* Flipping and stretching are supported. * Flipping and stretching are supported.
* \param filter one of PIPE_TEX_MIPFILTER_NEAREST/LINEAR * \param filter one of PIPE_TEX_FILTER_NEAREST/LINEAR
* \param writemask controls which channels in the dest surface are sourced * \param writemask controls which channels in the dest surface are sourced
* from the src surface. Disabled channels are sourced * from the src surface. Disabled channels are sourced
* from (0,0,0,1). * from (0,0,0,1).
@ -364,8 +364,8 @@ util_blit_pixels(struct blit_state *ctx,
util_format_description(src_tex->format); util_format_description(src_tex->format);
struct pipe_blit_info info; struct pipe_blit_info info;
assert(filter == PIPE_TEX_MIPFILTER_NEAREST || assert(filter == PIPE_TEX_FILTER_NEAREST ||
filter == PIPE_TEX_MIPFILTER_LINEAR); filter == PIPE_TEX_FILTER_LINEAR);
assert(src_level <= src_tex->last_level); assert(src_level <= src_tex->last_level);
@ -486,8 +486,8 @@ util_blit_pixels_tex(struct blit_state *ctx,
unsigned offset; unsigned offset;
struct pipe_resource *tex = src_sampler_view->texture; struct pipe_resource *tex = src_sampler_view->texture;
assert(filter == PIPE_TEX_MIPFILTER_NEAREST || assert(filter == PIPE_TEX_FILTER_NEAREST ||
filter == PIPE_TEX_MIPFILTER_LINEAR); filter == PIPE_TEX_FILTER_LINEAR);
assert(tex); assert(tex);
assert(tex->width0 != 0); assert(tex->width0 != 0);