From 78b1a29a0da8d1877408421df5012d37084a96de Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 9 Aug 2007 19:09:19 +0100 Subject: Split texfilter enums to match common hardware usage. --- src/mesa/pipe/p_defines.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/mesa/pipe/p_defines.h') diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h index 9eb4c37434..efbb3239a2 100644 --- a/src/mesa/pipe/p_defines.h +++ b/src/mesa/pipe/p_defines.h @@ -134,12 +134,18 @@ #define PIPE_TEX_WRAP_MIRROR_CLAMP_TO_EDGE 6 #define PIPE_TEX_WRAP_MIRROR_CLAMP_TO_BORDER 7 -#define PIPE_TEX_FILTER_NEAREST 0 -#define PIPE_TEX_FILTER_LINEAR 1 -#define PIPE_TEX_FILTER_NEAREST_MIPMAP_NEAREST 2 -#define PIPE_TEX_FILTER_NEAREST_MIPMAP_LINEAR 3 -#define PIPE_TEX_FILTER_LINEAR_MIPMAP_NEAREST 4 -#define PIPE_TEX_FILTER_LINEAR_MIPMAP_LINEAR 5 +/* Between mipmaps, ie mipfilter + */ +#define PIPE_TEX_MIPFILTER_NEAREST 0 +#define PIPE_TEX_MIPFILTER_LINEAR 1 +#define PIPE_TEX_MIPFILTER_NONE 2 + +/* Within a mipmap, ie min/mag filter + */ +#define PIPE_TEX_FILTER_NEAREST 0 +#define PIPE_TEX_FILTER_LINEAR 1 +//#define PIPE_TEX_FILTER_ANISO 2 + #define PIPE_TEX_COMPARE_NONE 0 #define PIPE_TEX_COMPARE_R_TO_TEXTURE 1 -- cgit v1.2.3