summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/pipe/p_defines.h18
-rw-r--r--src/mesa/pipe/p_state.h5
-rw-r--r--src/mesa/pipe/softpipe/sp_tex_sample.c11
-rw-r--r--src/mesa/state_tracker/st_atom_sampler.c46
4 files changed, 54 insertions, 26 deletions
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h
index 9eb4c374348..efbb3239a2e 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
diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h
index ee29e38a48c..64a475ba00d 100644
--- a/src/mesa/pipe/p_state.h
+++ b/src/mesa/pipe/p_state.h
@@ -213,8 +213,9 @@ struct pipe_sampler_state
GLuint wrap_s:3; /**< PIPE_TEX_WRAP_x */
GLuint wrap_t:3; /**< PIPE_TEX_WRAP_x */
GLuint wrap_r:3; /**< PIPE_TEX_WRAP_x */
- GLuint min_filter:3; /**< PIPE_TEX_FILTER_x */
- GLuint mag_filter:1; /**< PIPE_TEX_FILTER_LINEAR or _NEAREST */
+ GLuint min_img_filter:2; /**< PIPE_TEX_FILTER_x */
+ GLuint min_mip_filter:2; /**< PIPE_TEX_MIPFILTER_x */
+ GLuint mag_img_filter:2; /**< PIPE_TEX_FILTER_x */
GLuint compare:1; /**< shadow/depth compare enabled? */
GLenum compare_mode:1; /**< PIPE_TEX_COMPARE_x */
GLenum compare_func:3; /**< PIPE_FUNC_x */
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/mesa/pipe/softpipe/sp_tex_sample.c
index dcc9485cf60..40350eec750 100644
--- a/src/mesa/pipe/softpipe/sp_tex_sample.c
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.c
@@ -417,7 +417,7 @@ sp_get_sample_1d(struct tgsi_sampler *sampler,
struct pipe_surface *ps
= pipe->get_tex_surface(pipe, sampler->texture, 0, 0, 0);
- switch (sampler->state->min_filter) {
+ switch (sampler->state->min_img_filter) {
case PIPE_TEX_FILTER_NEAREST:
{
GLint x;
@@ -450,9 +450,7 @@ sp_get_sample_1d(struct tgsi_sampler *sampler,
static GLuint
choose_mipmap_level(struct tgsi_sampler *sampler, GLfloat lambda)
{
- if (sampler->state->min_filter == sampler->state->mag_filter) {
- assert(sampler->state->min_filter == PIPE_TEX_FILTER_LINEAR ||
- sampler->state->min_filter == PIPE_TEX_FILTER_NEAREST);
+ if (sampler->state->min_mip_filter == PIPE_TEX_MIPFILTER_NONE) {
return 0;
}
else {
@@ -485,15 +483,14 @@ sp_get_sample_2d(struct tgsi_sampler *sampler,
GLint level0;
if (lambda < 0.0)
- filter = sampler->state->mag_filter;
+ filter = sampler->state->mag_img_filter;
else
- filter = sampler->state->min_filter;
+ filter = sampler->state->min_img_filter;
level0 = choose_mipmap_level(sampler, lambda);
switch (filter) {
case PIPE_TEX_FILTER_NEAREST:
- case PIPE_TEX_FILTER_NEAREST_MIPMAP_NEAREST:
{
GLint x = nearest_texcoord(sampler->state->wrap_s, strq[0],
sampler->texture->level[level0].width);
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 066ce7860f3..7d568baf9e6 100644
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -69,28 +69,50 @@ gl_wrap_to_sp(GLenum wrap)
static GLuint
-gl_filter_to_sp(GLenum filter)
+gl_filter_to_mip_filter(GLenum filter)
{
switch (filter) {
case GL_NEAREST:
- return PIPE_TEX_FILTER_NEAREST;
case GL_LINEAR:
- return PIPE_TEX_FILTER_LINEAR;
+ return PIPE_TEX_MIPFILTER_NONE;
+
case GL_NEAREST_MIPMAP_NEAREST:
- return PIPE_TEX_FILTER_NEAREST_MIPMAP_NEAREST;
+ case GL_LINEAR_MIPMAP_NEAREST:
+ return PIPE_TEX_MIPFILTER_NEAREST;
+
case GL_NEAREST_MIPMAP_LINEAR:
- return PIPE_TEX_FILTER_NEAREST_MIPMAP_LINEAR;
+ case GL_LINEAR_MIPMAP_LINEAR:
+ return PIPE_TEX_MIPFILTER_LINEAR;
+
+ default:
+ assert(0);
+ return PIPE_TEX_MIPFILTER_NONE;
+ }
+}
+
+
+static GLuint
+gl_filter_to_img_filter(GLenum filter)
+{
+ switch (filter) {
+ case GL_NEAREST:
+ case GL_NEAREST_MIPMAP_NEAREST:
+ case GL_NEAREST_MIPMAP_LINEAR:
+ return PIPE_TEX_FILTER_NEAREST;
+
+ case GL_LINEAR:
case GL_LINEAR_MIPMAP_NEAREST:
- return PIPE_TEX_FILTER_LINEAR_MIPMAP_NEAREST;
case GL_LINEAR_MIPMAP_LINEAR:
- return PIPE_TEX_FILTER_LINEAR_MIPMAP_LINEAR;
+ return PIPE_TEX_FILTER_LINEAR;
+
default:
- abort();
- return 0;
+ assert(0);
+ return PIPE_TEX_FILTER_NEAREST;
}
}
+
static void
update_samplers(struct st_context *st)
{
@@ -108,12 +130,14 @@ update_samplers(struct st_context *st)
sampler.wrap_t = gl_wrap_to_sp(texobj->WrapT);
sampler.wrap_r = gl_wrap_to_sp(texobj->WrapR);
- sampler.min_filter = gl_filter_to_sp(texobj->MinFilter);
- sampler.mag_filter = gl_filter_to_sp(texobj->MagFilter);
+ sampler.min_img_filter = gl_filter_to_img_filter(texobj->MinFilter);
+ sampler.min_mip_filter = gl_filter_to_mip_filter(texobj->MinFilter);
+ sampler.mag_img_filter = gl_filter_to_img_filter(texobj->MagFilter);
sampler.lod_bias = st->ctx->Texture.Unit[u].LodBias;
sampler.min_lod = texobj->MinLod;
sampler.max_lod = texobj->MaxLod;
+ sampler.max_anisotropy = texobj->MaxAnisotropy;
/* XXX more sampler state here */
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 07:36:06 +0000