summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/pipe/softpipe/sp_tex_sample.c129
-rw-r--r--src/mesa/pipe/softpipe/sp_tex_sample.h1
-rw-r--r--src/mesa/pipe/tgsi/core/tgsi_exec.c9
-rw-r--r--src/mesa/pipe/tgsi/core/tgsi_exec.h1
4 files changed, 113 insertions, 27 deletions
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.c b/src/mesa/pipe/softpipe/sp_tex_sample.c
index 2005a3dbcd6..ab26b184c11 100644
--- a/src/mesa/pipe/softpipe/sp_tex_sample.c
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.c
@@ -417,7 +417,8 @@ static float
compute_lambda(struct tgsi_sampler *sampler,
const float s[QUAD_SIZE],
const float t[QUAD_SIZE],
- const float p[QUAD_SIZE])
+ const float p[QUAD_SIZE],
+ float lodbias)
{
float rho, lambda;
@@ -450,7 +451,7 @@ compute_lambda(struct tgsi_sampler *sampler,
lambda = LOG2(rho);
- lambda += sampler->state->lod_bias;
+ lambda += lodbias + sampler->state->lod_bias;
lambda = CLAMP(lambda, sampler->state->min_lod, sampler->state->max_lod);
return lambda;
@@ -462,6 +463,7 @@ sp_get_samples_1d(struct tgsi_sampler *sampler,
const float s[QUAD_SIZE],
const float t[QUAD_SIZE],
const float p[QUAD_SIZE],
+ float lodbias,
float rgba[NUM_CHANNELS][QUAD_SIZE])
{
struct pipe_context *pipe = (struct pipe_context *) sampler->pipe;
@@ -512,17 +514,43 @@ sp_get_samples_1d(struct tgsi_sampler *sampler,
}
}
-static GLuint
-choose_mipmap_level(struct tgsi_sampler *sampler, float lambda)
+
+/**
+ * From lambda and the min_mip_filter setting, choose the mipmap level(s)
+ * that are to be sampled from.
+ */
+static void
+choose_mipmap_levels(struct tgsi_sampler *sampler, float lambda,
+ unsigned *level0, unsigned *level1)
{
- if (sampler->state->min_mip_filter == PIPE_TEX_MIPFILTER_NONE) {
- return 0;
- }
- else {
- GLint level = (int) lambda;
- level = CLAMP(level, sampler->texture->first_level,
- sampler->texture->last_level);
- return level;
+ switch (sampler->state->min_mip_filter) {
+ case PIPE_TEX_MIPFILTER_NONE:
+ *level0 = *level1 = 0;
+ return;
+ case PIPE_TEX_MIPFILTER_NEAREST:
+ {
+ const int lvl = (int) (lambda + 0.5);
+ *level0 =
+ *level1 = CLAMP(lvl,
+ (int) sampler->texture->first_level,
+ (int) sampler->texture->last_level);
+ }
+ return;
+ case PIPE_TEX_MIPFILTER_LINEAR:
+ {
+ const int lvl = (int) lambda;
+ *level0 = CLAMP(lvl,
+ (int) sampler->texture->first_level,
+ (int) sampler->texture->last_level);
+ *level1 = CLAMP(lvl + 1,
+ (int) sampler->texture->first_level,
+ (int) sampler->texture->last_level);
+ assert(*level0 < 100);
+ assert(*level1 < 100);
+ }
+ return;
+ default:
+ assert(0);
}
}
@@ -571,10 +599,14 @@ get_texel(struct tgsi_sampler *sampler,
if (cx != sampler->cache_x || cy != sampler->cache_y ||
level != sampler->cache_level) {
cache_tex_tile(sampler, face, level, zslice, cx, cy);
+ /*
printf("cache miss (%d, %d)\n", x, y);
+ */
}
else {
+ /*
printf("cache hit (%d, %d)\n", x, y);
+ */
}
/* get texel from cache */
@@ -605,27 +637,41 @@ sp_get_samples_2d(struct tgsi_sampler *sampler,
const float s[QUAD_SIZE],
const float t[QUAD_SIZE],
const float p[QUAD_SIZE],
+ float lodbias,
float rgba[NUM_CHANNELS][QUAD_SIZE])
{
- GLuint j, imgFilter;
- int level0, width, height;
+ unsigned level0, level1, j, imgFilter;
+ int width, height;
+ float mipBlend;
/* compute level0 and imgFilter */
switch (sampler->state->min_mip_filter) {
case PIPE_TEX_MIPFILTER_NONE:
imgFilter = sampler->state->mag_img_filter;
- level0 = 0;
+ level0 = level1 = 0;
assert(sampler->state->min_img_filter ==
sampler->state->mag_img_filter);
break;
default:
{
- float lambda = compute_lambda(sampler, s, t, p);
- if (lambda < 0.0)
- imgFilter = sampler->state->mag_img_filter;
+ float lambda;
+ int fragment = 1;
+ if (fragment)
+ lambda = compute_lambda(sampler, s, t, p, lodbias);
else
+ lambda = lodbias; /* not really a bias, but absolute LOD */
+
+ if (lambda < 0.0) {
+ /* magnifying */
+ imgFilter = sampler->state->mag_img_filter;
+ level0 = level1 = 0;
+ }
+ else {
+ /* minifying */
imgFilter = sampler->state->min_img_filter;
- level0 = choose_mipmap_level(sampler, lambda);
+ choose_mipmap_levels(sampler, lambda, &level0, &level1);
+ mipBlend = FRAC(lambda); /* blending weight between levels */
+ }
}
}
@@ -640,6 +686,18 @@ sp_get_samples_2d(struct tgsi_sampler *sampler,
int x = nearest_texcoord(sampler->state->wrap_s, s[j], width);
int y = nearest_texcoord(sampler->state->wrap_t, t[j], height);
get_texel(sampler, 0, level0, 0, x, y, rgba, j);
+
+ if (level0 != level1) {
+ /* get texels from second mipmap level and blend */
+ float rgba2[4][4];
+ unsigned c;
+ x = x / 2;
+ y = y / 2;
+ get_texel(sampler, 0, level1, 0, x, y, rgba2, j);
+ for (c = 0; c < NUM_CHANNELS; c++) {
+ rgba[c][j] = LERP(mipBlend, rgba2[c][j], rgba[c][j]);
+ }
+ }
}
break;
case PIPE_TEX_FILTER_LINEAR:
@@ -655,6 +713,28 @@ sp_get_samples_2d(struct tgsi_sampler *sampler,
for (c = 0; c < 4; c++) {
rgba[c][j] = lerp_2d(a, b, tx[c][0], tx[c][1], tx[c][2], tx[c][3]);
}
+
+ if (level0 != level1) {
+ /* get texels from second mipmap level and blend */
+ float rgba2[4][4];
+ unsigned c;
+ x0 = x0 / 2;
+ y0 = y0 / 2;
+ x1 = x1 / 2;
+ y1 = y1 / 2;
+ get_texel(sampler, 0, level1, 0, x0, y0, tx, 0);
+ get_texel(sampler, 0, level1, 0, x1, y0, tx, 1);
+ get_texel(sampler, 0, level1, 0, x0, y1, tx, 2);
+ get_texel(sampler, 0, level1, 0, x1, y1, tx, 3);
+ for (c = 0; c < 4; c++) {
+ rgba2[c][j] = lerp_2d(a, b,
+ tx[c][0], tx[c][1], tx[c][2], tx[c][3]);
+ }
+
+ for (c = 0; c < NUM_CHANNELS; c++) {
+ rgba[c][j] = LERP(mipBlend, rgba[c][j], rgba2[c][j]);
+ }
+ }
}
break;
default:
@@ -668,6 +748,7 @@ sp_get_samples_3d(struct tgsi_sampler *sampler,
const float s[QUAD_SIZE],
const float t[QUAD_SIZE],
const float p[QUAD_SIZE],
+ float lodbias,
float rgba[NUM_CHANNELS][QUAD_SIZE])
{
/* get/map pipe_surfaces corresponding to 3D tex slices */
@@ -679,6 +760,7 @@ sp_get_samples_cube(struct tgsi_sampler *sampler,
const float s[QUAD_SIZE],
const float t[QUAD_SIZE],
const float p[QUAD_SIZE],
+ float lodbias,
float rgba[NUM_CHANNELS][QUAD_SIZE])
{
GLuint j;
@@ -696,20 +778,21 @@ sp_get_samples(struct tgsi_sampler *sampler,
const float s[QUAD_SIZE],
const float t[QUAD_SIZE],
const float p[QUAD_SIZE],
+ float lodbias,
float rgba[NUM_CHANNELS][QUAD_SIZE])
{
switch (sampler->texture->target) {
case GL_TEXTURE_1D:
- sp_get_samples_1d(sampler, s, t, p, rgba);
+ sp_get_samples_1d(sampler, s, t, p, lodbias, rgba);
break;
case GL_TEXTURE_2D:
- sp_get_samples_2d(sampler, s, t, p, rgba);
+ sp_get_samples_2d(sampler, s, t, p, lodbias, rgba);
break;
case GL_TEXTURE_3D:
- sp_get_samples_3d(sampler, s, t, p, rgba);
+ sp_get_samples_3d(sampler, s, t, p, lodbias, rgba);
break;
case GL_TEXTURE_CUBE_MAP:
- sp_get_samples_cube(sampler, s, t, p, rgba);
+ sp_get_samples_cube(sampler, s, t, p, lodbias, rgba);
break;
default:
assert(0);
diff --git a/src/mesa/pipe/softpipe/sp_tex_sample.h b/src/mesa/pipe/softpipe/sp_tex_sample.h
index 417752d2d50..43aae872836 100644
--- a/src/mesa/pipe/softpipe/sp_tex_sample.h
+++ b/src/mesa/pipe/softpipe/sp_tex_sample.h
@@ -10,6 +10,7 @@ sp_get_samples(struct tgsi_sampler *sampler,
const GLfloat s[QUAD_SIZE],
const GLfloat t[QUAD_SIZE],
const GLfloat p[QUAD_SIZE],
+ float lodbias,
GLfloat rgba[NUM_CHANNELS][QUAD_SIZE]);
diff --git a/src/mesa/pipe/tgsi/core/tgsi_exec.c b/src/mesa/pipe/tgsi/core/tgsi_exec.c
index 03b3b49e2b5..0a34754c40b 100644
--- a/src/mesa/pipe/tgsi/core/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/core/tgsi_exec.c
@@ -1044,6 +1044,7 @@ fetch_texel( struct tgsi_sampler *sampler,
const union tgsi_exec_channel *s,
const union tgsi_exec_channel *t,
const union tgsi_exec_channel *p,
+ float lodbias,
union tgsi_exec_channel *r,
union tgsi_exec_channel *g,
union tgsi_exec_channel *b,
@@ -1052,7 +1053,7 @@ fetch_texel( struct tgsi_sampler *sampler,
GLuint j;
GLfloat rgba[NUM_CHANNELS][QUAD_SIZE];
- sampler->get_samples(sampler, s->f, t->f, p->f, rgba);
+ sampler->get_samples(sampler, s->f, t->f, p->f, lodbias, rgba);
for (j = 0; j < 4; j++) {
r->f[j] = rgba[0][j];
@@ -1608,7 +1609,7 @@ exec_instruction(
}
fetch_texel(&mach->Samplers[unit],
- &r[0], NULL, NULL,
+ &r[0], NULL, NULL, 0.0,
&r[0], &r[1], &r[2], &r[3]);
break;
@@ -1633,7 +1634,7 @@ exec_instruction(
}
fetch_texel(&mach->Samplers[unit],
- &r[0], &r[1], NULL,
+ &r[0], &r[1], NULL, 0.0,
&r[0], &r[1], &r[2], &r[3]);
break;
@@ -1660,7 +1661,7 @@ exec_instruction(
}
fetch_texel(&mach->Samplers[unit],
- &r[0], &r[1], &r[2],
+ &r[0], &r[1], &r[2], 0.0,
&r[0], &r[1], &r[2], &r[3]);
break;
diff --git a/src/mesa/pipe/tgsi/core/tgsi_exec.h b/src/mesa/pipe/tgsi/core/tgsi_exec.h
index 4e6fef57243..b3ed124d3f9 100644
--- a/src/mesa/pipe/tgsi/core/tgsi_exec.h
+++ b/src/mesa/pipe/tgsi/core/tgsi_exec.h
@@ -37,6 +37,7 @@ struct tgsi_sampler
const GLfloat s[QUAD_SIZE],
const GLfloat t[QUAD_SIZE],
const GLfloat p[QUAD_SIZE],
+ GLfloat lodbias,
GLfloat rgba[NUM_CHANNELS][QUAD_SIZE]);
void *pipe; /*XXX temporary*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 20:34:45 +0000