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

softpipe: Constify variables 

This commit makes a lot of variables constant - this is basically done
by moving the computation to variable definition. Some of them are
moved into lower scopes (like in img_filter_2d_ewa).

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Krzesimir Nowak 2015-09-11 20:07:42 +02:00 committed by Brian Paul
parent 231687c19b
commit 2135aba8d9
1 changed files with 199 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

441
src/gallium/drivers/softpipe/sp_tex_sample.c
View File

@ -135,7 +135,7 @@ wrap_nearest_repeat(float s, unsigned size, int offset, int *icoord)
{ {
/* s limited to [0,1) */ /* s limited to [0,1) */
/* i limited to [0,size-1] */ /* i limited to [0,size-1] */
int i = util_ifloor(s * size); const int i = util_ifloor(s * size);
*icoord = repeat(i + offset, size); *icoord = repeat(i + offset, size);
} }
@ -280,7 +280,7 @@ static void
wrap_linear_repeat(float s, unsigned size, int offset, wrap_linear_repeat(float s, unsigned size, int offset,
int *icoord0, int *icoord1, float *w) int *icoord0, int *icoord1, float *w)
{ {
float u = s * size - 0.5F; const float u = s * size - 0.5F;
*icoord0 = repeat(util_ifloor(u) + offset, size); *icoord0 = repeat(util_ifloor(u) + offset, size);
*icoord1 = repeat(*icoord0 + 1, size); *icoord1 = repeat(*icoord0 + 1, size);
*w = frac(u); *w = frac(u);
@ -291,9 +291,8 @@ static void
wrap_linear_clamp(float s, unsigned size, int offset, wrap_linear_clamp(float s, unsigned size, int offset,
int *icoord0, int *icoord1, float *w) int *icoord0, int *icoord1, float *w)
{ {
float u = CLAMP(s * size + offset, 0.0F, (float)size); const float u = CLAMP(s * size + offset, 0.0F, (float)size) - 0.5f;
u = u - 0.5f;
*icoord0 = util_ifloor(u); *icoord0 = util_ifloor(u);
*icoord1 = *icoord0 + 1; *icoord1 = *icoord0 + 1;
*w = frac(u); *w = frac(u);
@ -304,8 +303,7 @@ static void
wrap_linear_clamp_to_edge(float s, unsigned size, int offset, wrap_linear_clamp_to_edge(float s, unsigned size, int offset,
int *icoord0, int *icoord1, float *w) int *icoord0, int *icoord1, float *w)
{ {
float u = CLAMP(s * size + offset, 0.0F, (float)size); const float u = CLAMP(s * size + offset, 0.0F, (float)size) - 0.5f;
u = u - 0.5f;
*icoord0 = util_ifloor(u); *icoord0 = util_ifloor(u);
*icoord1 = *icoord0 + 1; *icoord1 = *icoord0 + 1;
if (*icoord0 < 0) if (*icoord0 < 0)
@ -322,8 +320,7 @@ wrap_linear_clamp_to_border(float s, unsigned size, int offset,
{ {
const float min = -0.5F; const float min = -0.5F;
const float max = (float)size + 0.5F; const float max = (float)size + 0.5F;
float u = CLAMP(s * size + offset, min, max); const float u = CLAMP(s * size + offset, min, max) - 0.5f;
u = u - 0.5f;
*icoord0 = util_ifloor(u); *icoord0 = util_ifloor(u);
*icoord1 = *icoord0 + 1; *icoord1 = *icoord0 + 1;
*w = frac(u); *w = frac(u);
@ -391,12 +388,8 @@ wrap_linear_mirror_clamp_to_border(float s, unsigned size, int offset,
{ {
const float min = -0.5F; const float min = -0.5F;
const float max = size + 0.5F; const float max = size + 0.5F;
float u = fabsf(s * size + offset); const float t = fabsf(s * size + offset);
if (u <= min) const float u = CLAMP(t, min, max) - 0.5F;
u = min;
else if (u >= max)
u = max;
u -= 0.5F;
*icoord0 = util_ifloor(u); *icoord0 = util_ifloor(u);
*icoord1 = *icoord0 + 1; *icoord1 = *icoord0 + 1;
*w = frac(u); *w = frac(u);
@ -409,7 +402,7 @@ wrap_linear_mirror_clamp_to_border(float s, unsigned size, int offset,
static void static void
wrap_nearest_unorm_clamp(float s, unsigned size, int offset, int *icoord) wrap_nearest_unorm_clamp(float s, unsigned size, int offset, int *icoord)
{ {
int i = util_ifloor(s); const int i = util_ifloor(s);
*icoord = CLAMP(i + offset, 0, (int) size-1); *icoord = CLAMP(i + offset, 0, (int) size-1);
} }
@ -442,7 +435,7 @@ wrap_linear_unorm_clamp(float s, unsigned size, int offset,
int *icoord0, int *icoord1, float *w) int *icoord0, int *icoord1, float *w)
{ {
/* Not exactly what the spec says, but it matches NVIDIA output */ /* Not exactly what the spec says, but it matches NVIDIA output */
float u = CLAMP(s + offset - 0.5F, 0.0f, (float) size - 1.0f); const float u = CLAMP(s + offset - 0.5F, 0.0f, (float) size - 1.0f);
*icoord0 = util_ifloor(u); *icoord0 = util_ifloor(u);
*icoord1 = *icoord0 + 1; *icoord1 = *icoord0 + 1;
*w = frac(u); *w = frac(u);
@ -456,8 +449,7 @@ static void
wrap_linear_unorm_clamp_to_border(float s, unsigned size, int offset, wrap_linear_unorm_clamp_to_border(float s, unsigned size, int offset,
int *icoord0, int *icoord1, float *w) int *icoord0, int *icoord1, float *w)
{ {
float u = CLAMP(s + offset, -0.5F, (float) size + 0.5F); const float u = CLAMP(s + offset, -0.5F, (float) size + 0.5F) - 0.5F;
u -= 0.5F;
*icoord0 = util_ifloor(u); *icoord0 = util_ifloor(u);
*icoord1 = *icoord0 + 1; *icoord1 = *icoord0 + 1;
if (*icoord1 > (int) size - 1) if (*icoord1 > (int) size - 1)
@ -473,8 +465,7 @@ static void
wrap_linear_unorm_clamp_to_edge(float s, unsigned size, int offset, wrap_linear_unorm_clamp_to_edge(float s, unsigned size, int offset,
int *icoord0, int *icoord1, float *w) int *icoord0, int *icoord1, float *w)
{ {
float u = CLAMP(s + offset, +0.5F, (float) size - 0.5F); const float u = CLAMP(s + offset, +0.5F, (float) size - 0.5F) - 0.5F;
u -= 0.5F;
*icoord0 = util_ifloor(u); *icoord0 = util_ifloor(u);
*icoord1 = *icoord0 + 1; *icoord1 = *icoord0 + 1;
if (*icoord1 > (int) size - 1) if (*icoord1 > (int) size - 1)
@ -489,7 +480,7 @@ wrap_linear_unorm_clamp_to_edge(float s, unsigned size, int offset,
static inline int static inline int
coord_to_layer(float coord, unsigned first_layer, unsigned last_layer) coord_to_layer(float coord, unsigned first_layer, unsigned last_layer)
{ {
int c = util_ifloor(coord + 0.5F); const int c = util_ifloor(coord + 0.5F);
return CLAMP(c, (int)first_layer, (int)last_layer); return CLAMP(c, (int)first_layer, (int)last_layer);
} }
@ -505,9 +496,9 @@ compute_lambda_1d(const struct sp_sampler_view *sview,
const float p[TGSI_QUAD_SIZE]) const float p[TGSI_QUAD_SIZE])
{ {
const struct pipe_resource *texture = sview->base.texture; const struct pipe_resource *texture = sview->base.texture;
float dsdx = fabsf(s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]); const float dsdx = fabsf(s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]);
float dsdy = fabsf(s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]); const float dsdy = fabsf(s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]);
float rho = MAX2(dsdx, dsdy) * u_minify(texture->width0, sview->base.u.tex.first_level); const float rho = MAX2(dsdx, dsdy) * u_minify(texture->width0, sview->base.u.tex.first_level);
return util_fast_log2(rho); return util_fast_log2(rho);
} }
@ -520,13 +511,13 @@ compute_lambda_2d(const struct sp_sampler_view *sview,
const float p[TGSI_QUAD_SIZE]) const float p[TGSI_QUAD_SIZE])
{ {
const struct pipe_resource *texture = sview->base.texture; const struct pipe_resource *texture = sview->base.texture;
float dsdx = fabsf(s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]); const float dsdx = fabsf(s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]);
float dsdy = fabsf(s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]); const float dsdy = fabsf(s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]);
float dtdx = fabsf(t[QUAD_BOTTOM_RIGHT] - t[QUAD_BOTTOM_LEFT]); const float dtdx = fabsf(t[QUAD_BOTTOM_RIGHT] - t[QUAD_BOTTOM_LEFT]);
float dtdy = fabsf(t[QUAD_TOP_LEFT] - t[QUAD_BOTTOM_LEFT]); const float dtdy = fabsf(t[QUAD_TOP_LEFT] - t[QUAD_BOTTOM_LEFT]);
float maxx = MAX2(dsdx, dsdy) * u_minify(texture->width0, sview->base.u.tex.first_level); const float maxx = MAX2(dsdx, dsdy) * u_minify(texture->width0, sview->base.u.tex.first_level);
float maxy = MAX2(dtdx, dtdy) * u_minify(texture->height0, sview->base.u.tex.first_level); const float maxy = MAX2(dtdx, dtdy) * u_minify(texture->height0, sview->base.u.tex.first_level);
float rho = MAX2(maxx, maxy); const float rho = MAX2(maxx, maxy);
return util_fast_log2(rho); return util_fast_log2(rho);
} }
@ -539,19 +530,16 @@ compute_lambda_3d(const struct sp_sampler_view *sview,
const float p[TGSI_QUAD_SIZE]) const float p[TGSI_QUAD_SIZE])
{ {
const struct pipe_resource *texture = sview->base.texture; const struct pipe_resource *texture = sview->base.texture;
float dsdx = fabsf(s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]); const float dsdx = fabsf(s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]);
float dsdy = fabsf(s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]); const float dsdy = fabsf(s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]);
float dtdx = fabsf(t[QUAD_BOTTOM_RIGHT] - t[QUAD_BOTTOM_LEFT]); const float dtdx = fabsf(t[QUAD_BOTTOM_RIGHT] - t[QUAD_BOTTOM_LEFT]);
float dtdy = fabsf(t[QUAD_TOP_LEFT] - t[QUAD_BOTTOM_LEFT]); const float dtdy = fabsf(t[QUAD_TOP_LEFT] - t[QUAD_BOTTOM_LEFT]);
float dpdx = fabsf(p[QUAD_BOTTOM_RIGHT] - p[QUAD_BOTTOM_LEFT]); const float dpdx = fabsf(p[QUAD_BOTTOM_RIGHT] - p[QUAD_BOTTOM_LEFT]);
float dpdy = fabsf(p[QUAD_TOP_LEFT] - p[QUAD_BOTTOM_LEFT]); const float dpdy = fabsf(p[QUAD_TOP_LEFT] - p[QUAD_BOTTOM_LEFT]);
float maxx = MAX2(dsdx, dsdy) * u_minify(texture->width0, sview->base.u.tex.first_level); const float maxx = MAX2(dsdx, dsdy) * u_minify(texture->width0, sview->base.u.tex.first_level);
float maxy = MAX2(dtdx, dtdy) * u_minify(texture->height0, sview->base.u.tex.first_level); const float maxy = MAX2(dtdx, dtdy) * u_minify(texture->height0, sview->base.u.tex.first_level);
float maxz = MAX2(dpdx, dpdy) * u_minify(texture->depth0, sview->base.u.tex.first_level); const float maxz = MAX2(dpdx, dpdy) * u_minify(texture->depth0, sview->base.u.tex.first_level);
float rho; const float rho = MAX3(maxx, maxy, maxz);
rho = MAX2(maxx, maxy);
rho = MAX2(rho, maxz);
return util_fast_log2(rho); return util_fast_log2(rho);
} }
@ -609,7 +597,7 @@ get_texel_2d(const struct sp_sampler_view *sp_sview,
union tex_tile_address addr, int x, int y) union tex_tile_address addr, int x, int y)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
unsigned level = addr.bits.level; const unsigned level = addr.bits.level;
if (x < 0 || x >= (int) u_minify(texture->width0, level) || if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level)) { y < 0 || y >= (int) u_minify(texture->height0, level)) {
@ -852,7 +840,7 @@ get_texel_3d(const struct sp_sampler_view *sp_sview,
union tex_tile_address addr, int x, int y, int z) union tex_tile_address addr, int x, int y, int z)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
unsigned level = addr.bits.level; const unsigned level = addr.bits.level;
if (x < 0 || x >= (int) u_minify(texture->width0, level) || if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level) || y < 0 || y >= (int) u_minify(texture->height0, level) ||
@ -872,7 +860,7 @@ get_texel_1d_array(const struct sp_sampler_view *sp_sview,
union tex_tile_address addr, int x, int y) union tex_tile_address addr, int x, int y)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
unsigned level = addr.bits.level; const unsigned level = addr.bits.level;
if (x < 0 || x >= (int) u_minify(texture->width0, level)) { if (x < 0 || x >= (int) u_minify(texture->width0, level)) {
return sp_samp->base.border_color.f; return sp_samp->base.border_color.f;
@ -890,7 +878,7 @@ get_texel_2d_array(const struct sp_sampler_view *sp_sview,
union tex_tile_address addr, int x, int y, int layer) union tex_tile_address addr, int x, int y, int layer)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
unsigned level = addr.bits.level; const unsigned level = addr.bits.level;
assert(layer < (int) texture->array_size); assert(layer < (int) texture->array_size);
assert(layer >= 0); assert(layer >= 0);
@ -911,7 +899,7 @@ get_texel_cube_seamless(const struct sp_sampler_view *sp_sview,
float *corner, int layer, unsigned face) float *corner, int layer, unsigned face)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
unsigned level = addr.bits.level; const unsigned level = addr.bits.level;
int new_x, new_y, max_x; int new_x, new_y, max_x;
max_x = (int) u_minify(texture->width0, level); max_x = (int) u_minify(texture->width0, level);
@ -966,7 +954,7 @@ get_texel_cube_array(const struct sp_sampler_view *sp_sview,
union tex_tile_address addr, int x, int y, int layer) union tex_tile_address addr, int x, int y, int layer)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
unsigned level = addr.bits.level; const unsigned level = addr.bits.level;
assert(layer < (int) texture->array_size); assert(layer < (int) texture->array_size);
assert(layer >= 0); assert(layer >= 0);
@ -1022,24 +1010,24 @@ img_filter_2d_linear_repeat_POT(const struct sp_sampler_view *sp_sview,
const struct img_filter_args *args, const struct img_filter_args *args,
float *rgba) float *rgba)
{ {
unsigned xpot = pot_level_size(sp_sview->xpot, args->level); const unsigned xpot = pot_level_size(sp_sview->xpot, args->level);
unsigned ypot = pot_level_size(sp_sview->ypot, args->level); const unsigned ypot = pot_level_size(sp_sview->ypot, args->level);
int xmax = (xpot - 1) & (TEX_TILE_SIZE - 1); /* MIN2(TEX_TILE_SIZE, xpot) - 1; */ const int xmax = (xpot - 1) & (TEX_TILE_SIZE - 1); /* MIN2(TEX_TILE_SIZE, xpot) - 1; */
int ymax = (ypot - 1) & (TEX_TILE_SIZE - 1); /* MIN2(TEX_TILE_SIZE, ypot) - 1; */ const int ymax = (ypot - 1) & (TEX_TILE_SIZE - 1); /* MIN2(TEX_TILE_SIZE, ypot) - 1; */
union tex_tile_address addr; union tex_tile_address addr;
int c; int c;
float u = (args->s * xpot - 0.5F) + args->offset[0]; const float u = (args->s * xpot - 0.5F) + args->offset[0];
float v = (args->t * ypot - 0.5F) + args->offset[1]; const float v = (args->t * ypot - 0.5F) + args->offset[1];
int uflr = util_ifloor(u); const int uflr = util_ifloor(u);
int vflr = util_ifloor(v); const int vflr = util_ifloor(v);
float xw = u - (float)uflr; const float xw = u - (float)uflr;
float yw = v - (float)vflr; const float yw = v - (float)vflr;
int x0 = uflr & (xpot - 1); const int x0 = uflr & (xpot - 1);
int y0 = vflr & (ypot - 1); const int y0 = vflr & (ypot - 1);
const float *tx[4]; const float *tx[4];
@ -1052,8 +1040,8 @@ img_filter_2d_linear_repeat_POT(const struct sp_sampler_view *sp_sview,
get_texel_quad_2d_no_border_single_tile(sp_sview, addr, x0, y0, tx); get_texel_quad_2d_no_border_single_tile(sp_sview, addr, x0, y0, tx);
} }
else { else {
unsigned x1 = (x0 + 1) & (xpot - 1); const unsigned x1 = (x0 + 1) & (xpot - 1);
unsigned y1 = (y0 + 1) & (ypot - 1); const unsigned y1 = (y0 + 1) & (ypot - 1);
get_texel_quad_2d_no_border(sp_sview, addr, x0, y0, x1, y1, tx); get_texel_quad_2d_no_border(sp_sview, addr, x0, y0, x1, y1, tx);
} }
@ -1076,20 +1064,20 @@ img_filter_2d_nearest_repeat_POT(const struct sp_sampler_view *sp_sview,
const struct img_filter_args *args, const struct img_filter_args *args,
float rgba[TGSI_QUAD_SIZE]) float rgba[TGSI_QUAD_SIZE])
{ {
unsigned xpot = pot_level_size(sp_sview->xpot, args->level); const unsigned xpot = pot_level_size(sp_sview->xpot, args->level);
unsigned ypot = pot_level_size(sp_sview->ypot, args->level); const unsigned ypot = pot_level_size(sp_sview->ypot, args->level);
const float *out; const float *out;
union tex_tile_address addr; union tex_tile_address addr;
int c; int c;
float u = args->s * xpot + args->offset[0]; const float u = args->s * xpot + args->offset[0];
float v = args->t * ypot + args->offset[1]; const float v = args->t * ypot + args->offset[1];
int uflr = util_ifloor(u); const int uflr = util_ifloor(u);
int vflr = util_ifloor(v); const int vflr = util_ifloor(v);
int x0 = uflr & (xpot - 1); const int x0 = uflr & (xpot - 1);
int y0 = vflr & (ypot - 1); const int y0 = vflr & (ypot - 1);
addr.value = 0; addr.value = 0;
addr.bits.level = args->level; addr.bits.level = args->level;
@ -1110,13 +1098,13 @@ img_filter_2d_nearest_clamp_POT(const struct sp_sampler_view *sp_sview,
const struct img_filter_args *args, const struct img_filter_args *args,
float rgba[TGSI_QUAD_SIZE]) float rgba[TGSI_QUAD_SIZE])
{ {
unsigned xpot = pot_level_size(sp_sview->xpot, args->level); const unsigned xpot = pot_level_size(sp_sview->xpot, args->level);
unsigned ypot = pot_level_size(sp_sview->ypot, args->level); const unsigned ypot = pot_level_size(sp_sview->ypot, args->level);
union tex_tile_address addr; union tex_tile_address addr;
int c; int c;
float u = args->s * xpot + args->offset[0]; const float u = args->s * xpot + args->offset[0];
float v = args->t * ypot + args->offset[1]; const float v = args->t * ypot + args->offset[1];
int x0, y0; int x0, y0;
const float *out; const float *out;
@ -1153,14 +1141,12 @@ img_filter_1d_nearest(const struct sp_sampler_view *sp_sview,
float rgba[TGSI_QUAD_SIZE]) float rgba[TGSI_QUAD_SIZE])
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width; const int width = u_minify(texture->width0, args->level);
int x; int x;
union tex_tile_address addr; union tex_tile_address addr;
const float *out; const float *out;
int c; int c;
width = u_minify(texture->width0, args->level);
assert(width > 0); assert(width > 0);
addr.value = 0; addr.value = 0;
@ -1185,22 +1171,20 @@ img_filter_1d_array_nearest(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width; const int width = u_minify(texture->width0, args->level);
int x, layer; const int layer = coord_to_layer(args->t, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
int x;
union tex_tile_address addr; union tex_tile_address addr;
const float *out; const float *out;
int c; int c;
width = u_minify(texture->width0, args->level);
assert(width > 0); assert(width > 0);
addr.value = 0; addr.value = 0;
addr.bits.level = args->level; addr.bits.level = args->level;
sp_samp->nearest_texcoord_s(args->s, width, args->offset[0], &x); sp_samp->nearest_texcoord_s(args->s, width, args->offset[0], &x);
layer = coord_to_layer(args->t, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
out = get_texel_1d_array(sp_sview, sp_samp, addr, x, layer); out = get_texel_1d_array(sp_sview, sp_samp, addr, x, layer);
for (c = 0; c < TGSI_QUAD_SIZE; c++) for (c = 0; c < TGSI_QUAD_SIZE; c++)
@ -1219,15 +1203,13 @@ img_filter_2d_nearest(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
const int height = u_minify(texture->height0, args->level);
int x, y; int x, y;
union tex_tile_address addr; union tex_tile_address addr;
const float *out; const float *out;
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1254,15 +1236,15 @@ img_filter_2d_array_nearest(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
int x, y, layer; const int height = u_minify(texture->height0, args->level);
const int layer = coord_to_layer(args->p, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
int x, y;
union tex_tile_address addr; union tex_tile_address addr;
const float *out; const float *out;
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1271,8 +1253,6 @@ img_filter_2d_array_nearest(const struct sp_sampler_view *sp_sview,
sp_samp->nearest_texcoord_s(args->s, width, args->offset[0], &x); sp_samp->nearest_texcoord_s(args->s, width, args->offset[0], &x);
sp_samp->nearest_texcoord_t(args->t, height, args->offset[1], &y); sp_samp->nearest_texcoord_t(args->t, height, args->offset[1], &y);
layer = coord_to_layer(args->p, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
out = get_texel_2d_array(sp_sview, sp_samp, addr, x, y, layer); out = get_texel_2d_array(sp_sview, sp_samp, addr, x, y, layer);
for (c = 0; c < TGSI_QUAD_SIZE; c++) for (c = 0; c < TGSI_QUAD_SIZE; c++)
@ -1291,15 +1271,14 @@ img_filter_cube_nearest(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
int x, y, layerface; const int height = u_minify(texture->height0, args->level);
const int layerface = args->face_id + sp_sview->base.u.tex.first_layer;
int x, y;
union tex_tile_address addr; union tex_tile_address addr;
const float *out; const float *out;
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1319,7 +1298,6 @@ img_filter_cube_nearest(const struct sp_sampler_view *sp_sview,
sp_samp->nearest_texcoord_t(args->t, height, args->offset[1], &y); sp_samp->nearest_texcoord_t(args->t, height, args->offset[1], &y);
} }
layerface = args->face_id + sp_sview->base.u.tex.first_layer;
out = get_texel_cube_array(sp_sview, sp_samp, addr, x, y, layerface); out = get_texel_cube_array(sp_sview, sp_samp, addr, x, y, layerface);
for (c = 0; c < TGSI_QUAD_SIZE; c++) for (c = 0; c < TGSI_QUAD_SIZE; c++)
rgba[TGSI_NUM_CHANNELS*c] = out[c]; rgba[TGSI_NUM_CHANNELS*c] = out[c];
@ -1336,15 +1314,17 @@ img_filter_cube_array_nearest(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
int x, y, layerface; const int height = u_minify(texture->height0, args->level);
const int layerface =
coord_to_layer(6 * args->p + sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer - 5) + args->face_id;
int x, y;
union tex_tile_address addr; union tex_tile_address addr;
const float *out; const float *out;
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1353,9 +1333,6 @@ img_filter_cube_array_nearest(const struct sp_sampler_view *sp_sview,
sp_samp->nearest_texcoord_s(args->s, width, args->offset[0], &x); sp_samp->nearest_texcoord_s(args->s, width, args->offset[0], &x);
sp_samp->nearest_texcoord_t(args->t, height, args->offset[1], &y); sp_samp->nearest_texcoord_t(args->t, height, args->offset[1], &y);
layerface = coord_to_layer(6 * args->p + sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer - 5) + args->face_id;
out = get_texel_cube_array(sp_sview, sp_samp, addr, x, y, layerface); out = get_texel_cube_array(sp_sview, sp_samp, addr, x, y, layerface);
for (c = 0; c < TGSI_QUAD_SIZE; c++) for (c = 0; c < TGSI_QUAD_SIZE; c++)
@ -1373,16 +1350,14 @@ img_filter_3d_nearest(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height, depth; const int width = u_minify(texture->width0, args->level);
const int height = u_minify(texture->height0, args->level);
const int depth = u_minify(texture->depth0, args->level);
int x, y, z; int x, y, z;
union tex_tile_address addr; union tex_tile_address addr;
const float *out; const float *out;
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
depth = u_minify(texture->depth0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
assert(depth > 0); assert(depth > 0);
@ -1407,15 +1382,13 @@ img_filter_1d_linear(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width; const int width = u_minify(texture->width0, args->level);
int x0, x1; int x0, x1;
float xw; /* weights */ float xw; /* weights */
union tex_tile_address addr; union tex_tile_address addr;
const float *tx0, *tx1; const float *tx0, *tx1;
int c; int c;
width = u_minify(texture->width0, args->level);
assert(width > 0); assert(width > 0);
addr.value = 0; addr.value = 0;
@ -1439,23 +1412,21 @@ img_filter_1d_array_linear(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width; const int width = u_minify(texture->width0, args->level);
int x0, x1, layer; const int layer = coord_to_layer(args->t, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
int x0, x1;
float xw; /* weights */ float xw; /* weights */
union tex_tile_address addr; union tex_tile_address addr;
const float *tx0, *tx1; const float *tx0, *tx1;
int c; int c;
width = u_minify(texture->width0, args->level);
assert(width > 0); assert(width > 0);
addr.value = 0; addr.value = 0;
addr.bits.level = args->level; addr.bits.level = args->level;
sp_samp->linear_texcoord_s(args->s, width, args->offset[0], &x0, &x1, &xw); sp_samp->linear_texcoord_s(args->s, width, args->offset[0], &x0, &x1, &xw);
layer = coord_to_layer(args->t, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
tx0 = get_texel_1d_array(sp_sview, sp_samp, addr, x0, layer); tx0 = get_texel_1d_array(sp_sview, sp_samp, addr, x0, layer);
tx1 = get_texel_1d_array(sp_sview, sp_samp, addr, x1, layer); tx1 = get_texel_1d_array(sp_sview, sp_samp, addr, x1, layer);
@ -1539,16 +1510,14 @@ img_filter_2d_linear(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
const int height = u_minify(texture->height0, args->level);
int x0, y0, x1, y1; int x0, y0, x1, y1;
float xw, yw; /* weights */ float xw, yw; /* weights */
union tex_tile_address addr; union tex_tile_address addr;
const float *tx[4]; const float *tx[4];
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1585,16 +1554,16 @@ img_filter_2d_array_linear(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
int x0, y0, x1, y1, layer; const int height = u_minify(texture->height0, args->level);
const int layer = coord_to_layer(args->p, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
int x0, y0, x1, y1;
float xw, yw; /* weights */ float xw, yw; /* weights */
union tex_tile_address addr; union tex_tile_address addr;
const float *tx[4]; const float *tx[4];
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1603,8 +1572,6 @@ img_filter_2d_array_linear(const struct sp_sampler_view *sp_sview,
sp_samp->linear_texcoord_s(args->s, width, args->offset[0], &x0, &x1, &xw); sp_samp->linear_texcoord_s(args->s, width, args->offset[0], &x0, &x1, &xw);
sp_samp->linear_texcoord_t(args->t, height, args->offset[1], &y0, &y1, &yw); sp_samp->linear_texcoord_t(args->t, height, args->offset[1], &y0, &y1, &yw);
layer = coord_to_layer(args->p, sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer);
tx[0] = get_texel_2d_array(sp_sview, sp_samp, addr, x0, y0, layer); tx[0] = get_texel_2d_array(sp_sview, sp_samp, addr, x0, y0, layer);
tx[1] = get_texel_2d_array(sp_sview, sp_samp, addr, x1, y0, layer); tx[1] = get_texel_2d_array(sp_sview, sp_samp, addr, x1, y0, layer);
@ -1633,8 +1600,10 @@ img_filter_cube_linear(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
int x0, y0, x1, y1, layer; const int height = u_minify(texture->height0, args->level);
const int layer = sp_sview->base.u.tex.first_layer;
int x0, y0, x1, y1;
float xw, yw; /* weights */ float xw, yw; /* weights */
union tex_tile_address addr; union tex_tile_address addr;
const float *tx[4]; const float *tx[4];
@ -1642,9 +1611,6 @@ img_filter_cube_linear(const struct sp_sampler_view *sp_sview,
corner2[TGSI_QUAD_SIZE], corner3[TGSI_QUAD_SIZE]; corner2[TGSI_QUAD_SIZE], corner3[TGSI_QUAD_SIZE];
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1665,8 +1631,6 @@ img_filter_cube_linear(const struct sp_sampler_view *sp_sview,
sp_samp->linear_texcoord_t(args->t, height, args->offset[1], &y0, &y1, &yw); sp_samp->linear_texcoord_t(args->t, height, args->offset[1], &y0, &y1, &yw);
} }
layer = sp_sview->base.u.tex.first_layer;
if (sp_samp->base.seamless_cube_map) { if (sp_samp->base.seamless_cube_map) {
tx[0] = get_texel_cube_seamless(sp_sview, addr, x0, y0, corner0, layer, args->face_id); tx[0] = get_texel_cube_seamless(sp_sview, addr, x0, y0, corner0, layer, args->face_id);
tx[1] = get_texel_cube_seamless(sp_sview, addr, x1, y0, corner1, layer, args->face_id); tx[1] = get_texel_cube_seamless(sp_sview, addr, x1, y0, corner1, layer, args->face_id);
@ -1701,8 +1665,13 @@ img_filter_cube_array_linear(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height; const int width = u_minify(texture->width0, args->level);
int x0, y0, x1, y1, layer; const int height = u_minify(texture->height0, args->level);
const int layer =
coord_to_layer(6 * args->p + sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer - 5);
int x0, y0, x1, y1;
float xw, yw; /* weights */ float xw, yw; /* weights */
union tex_tile_address addr; union tex_tile_address addr;
const float *tx[4]; const float *tx[4];
@ -1710,9 +1679,6 @@ img_filter_cube_array_linear(const struct sp_sampler_view *sp_sview,
corner2[TGSI_QUAD_SIZE], corner3[TGSI_QUAD_SIZE]; corner2[TGSI_QUAD_SIZE], corner3[TGSI_QUAD_SIZE];
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
assert(width > 0); assert(width > 0);
assert(height > 0); assert(height > 0);
@ -1733,10 +1699,6 @@ img_filter_cube_array_linear(const struct sp_sampler_view *sp_sview,
sp_samp->linear_texcoord_t(args->t, height, args->offset[1], &y0, &y1, &yw); sp_samp->linear_texcoord_t(args->t, height, args->offset[1], &y0, &y1, &yw);
} }
layer = coord_to_layer(6 * args->p + sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer - 5);
if (sp_samp->base.seamless_cube_map) { if (sp_samp->base.seamless_cube_map) {
tx[0] = get_texel_cube_seamless(sp_sview, addr, x0, y0, corner0, layer, args->face_id); tx[0] = get_texel_cube_seamless(sp_sview, addr, x0, y0, corner0, layer, args->face_id);
tx[1] = get_texel_cube_seamless(sp_sview, addr, x1, y0, corner1, layer, args->face_id); tx[1] = get_texel_cube_seamless(sp_sview, addr, x1, y0, corner1, layer, args->face_id);
@ -1770,17 +1732,15 @@ img_filter_3d_linear(const struct sp_sampler_view *sp_sview,
float *rgba) float *rgba)
{ {
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int width, height, depth; const int width = u_minify(texture->width0, args->level);
const int height = u_minify(texture->height0, args->level);
const int depth = u_minify(texture->depth0, args->level);
int x0, x1, y0, y1, z0, z1; int x0, x1, y0, y1, z0, z1;
float xw, yw, zw; /* interpolation weights */ float xw, yw, zw; /* interpolation weights */
union tex_tile_address addr; union tex_tile_address addr;
const float *tx00, *tx01, *tx02, *tx03, *tx10, *tx11, *tx12, *tx13; const float *tx00, *tx01, *tx02, *tx03, *tx10, *tx11, *tx12, *tx13;
int c; int c;
width = u_minify(texture->width0, args->level);
height = u_minify(texture->height0, args->level);
depth = u_minify(texture->depth0, args->level);
addr.value = 0; addr.value = 0;
addr.bits.level = args->level; addr.bits.level = args->level;
@ -1826,8 +1786,8 @@ compute_lod(const struct pipe_sampler_state *sampler,
const float lod_in[TGSI_QUAD_SIZE], const float lod_in[TGSI_QUAD_SIZE],
float lod[TGSI_QUAD_SIZE]) float lod[TGSI_QUAD_SIZE])
{ {
float min_lod = sampler->min_lod; const float min_lod = sampler->min_lod;
float max_lod = sampler->max_lod; const float max_lod = sampler->max_lod;
uint i; uint i;
switch (control) { switch (control) {
@ -1998,7 +1958,7 @@ mip_filter_linear(const struct sp_sampler_view *sp_sview,
args.gather_comp = get_gather_component(lod_in); args.gather_comp = get_gather_component(lod_in);
for (j = 0; j < TGSI_QUAD_SIZE; j++) { for (j = 0; j < TGSI_QUAD_SIZE; j++) {
int level0 = psview->u.tex.first_level + (int)lod[j]; const int level0 = psview->u.tex.first_level + (int)lod[j];
args.s = s[j]; args.s = s[j];
args.t = t[j]; args.t = t[j];
@ -2093,7 +2053,7 @@ mip_filter_nearest(const struct sp_sampler_view *sp_sview,
args.level = psview->u.tex.first_level; args.level = psview->u.tex.first_level;
mag_filter(sp_sview, sp_samp, &args, &rgba[0][j]); mag_filter(sp_sview, sp_samp, &args, &rgba[0][j]);
} else { } else {
int level = psview->u.tex.first_level + (int)(lod[j] + 0.5F); const int level = psview->u.tex.first_level + (int)(lod[j] + 0.5F);
args.level = MIN2(level, (int)psview->u.tex.last_level); args.level = MIN2(level, (int)psview->u.tex.last_level);
min_filter(sp_sview, sp_samp, &args, &rgba[0][j]); min_filter(sp_sview, sp_samp, &args, &rgba[0][j]);
} }
@ -2202,7 +2162,7 @@ mip_filter_none_no_filter_select(const struct sp_sampler_view *sp_sview,
/* For anisotropic filtering */ /* For anisotropic filtering */
#define WEIGHT_LUT_SIZE 1024 #define WEIGHT_LUT_SIZE 1024
static float *weightLut = NULL; static const float *weightLut = NULL;
/** /**
* Creates the look-up table used to speed-up EWA sampling * Creates the look-up table used to speed-up EWA sampling
@ -2212,14 +2172,15 @@ create_filter_table(void)
{ {
unsigned i; unsigned i;
if (!weightLut) { if (!weightLut) {
weightLut = (float *) MALLOC(WEIGHT_LUT_SIZE * sizeof(float)); float *lut = (float *) MALLOC(WEIGHT_LUT_SIZE * sizeof(float));
for (i = 0; i < WEIGHT_LUT_SIZE; ++i) { for (i = 0; i < WEIGHT_LUT_SIZE; ++i) {
float alpha = 2; const float alpha = 2;
float r2 = (float) i / (float) (WEIGHT_LUT_SIZE - 1); const float r2 = (float) i / (float) (WEIGHT_LUT_SIZE - 1);
float weight = (float) exp(-alpha * r2); const float weight = (float) exp(-alpha * r2);
weightLut[i] = weight; lut[i] = weight;
} }
weightLut = lut;
} }
} }
@ -2248,15 +2209,15 @@ img_filter_2d_ewa(const struct sp_sampler_view *sp_sview,
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
// ??? Won't the image filters blow up if level is negative? // ??? Won't the image filters blow up if level is negative?
unsigned level0 = level > 0 ? level : 0; const unsigned level0 = level > 0 ? level : 0;
float scaling = 1.0f / (1 << level0); const float scaling = 1.0f / (1 << level0);
int width = u_minify(texture->width0, level0); const int width = u_minify(texture->width0, level0);
int height = u_minify(texture->height0, level0); const int height = u_minify(texture->height0, level0);
struct img_filter_args args; struct img_filter_args args;
float ux = dudx * scaling; const float ux = dudx * scaling;
float vx = dvdx * scaling; const float vx = dvdx * scaling;
float uy = dudy * scaling; const float uy = dudy * scaling;
float vy = dvdy * scaling; const float vy = dvdy * scaling;
/* compute ellipse coefficients to bound the region: /* compute ellipse coefficients to bound the region:
* A*x*x + B*x*y + C*y*y = F. * A*x*x + B*x*y + C*y*y = F.
@ -2270,29 +2231,15 @@ img_filter_2d_ewa(const struct sp_sampler_view *sp_sview,
/* assert(F > 0.0); */ /* assert(F > 0.0); */
/* Compute the ellipse's (u,v) bounding box in texture space */ /* Compute the ellipse's (u,v) bounding box in texture space */
float d = -B*B+4.0f*C*A; const float d = -B*B+4.0f*C*A;
float box_u = 2.0f / d * sqrtf(d*C*F); /* box_u -> half of bbox with */ const float box_u = 2.0f / d * sqrtf(d*C*F); /* box_u -> half of bbox with */
float box_v = 2.0f / d * sqrtf(A*d*F); /* box_v -> half of bbox height */ const float box_v = 2.0f / d * sqrtf(A*d*F); /* box_v -> half of bbox height */
float rgba_temp[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]; float rgba_temp[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE];
float s_buffer[TGSI_QUAD_SIZE]; float s_buffer[TGSI_QUAD_SIZE];
float t_buffer[TGSI_QUAD_SIZE]; float t_buffer[TGSI_QUAD_SIZE];
float weight_buffer[TGSI_QUAD_SIZE]; float weight_buffer[TGSI_QUAD_SIZE];
unsigned buffer_next;
int j; int j;
float den; /* = 0.0F; */
float ddq;
float U; /* = u0 - tex_u; */
int v;
/* Scale ellipse formula to directly index the Filter Lookup Table.
* i.e. scale so that F = WEIGHT_LUT_SIZE-1
*/
double formScale = (double) (WEIGHT_LUT_SIZE - 1) / F;
A *= formScale;
B *= formScale;
C *= formScale;
/* F *= formScale; */ /* no need to scale F as we don't use it below here */
/* For each quad, the du and dx values are the same and so the ellipse is /* For each quad, the du and dx values are the same and so the ellipse is
* also the same. Note that texel/image access can only be performed using * also the same. Note that texel/image access can only be performed using
@ -2301,7 +2248,16 @@ img_filter_2d_ewa(const struct sp_sampler_view *sp_sview,
* using the s_buffer/t_buffer and weight_buffer. Only when the buffer is * using the s_buffer/t_buffer and weight_buffer. Only when the buffer is
* full, then the pixel values are read from the image. * full, then the pixel values are read from the image.
*/ */
ddq = 2 * A; const float ddq = 2 * A;
/* Scale ellipse formula to directly index the Filter Lookup Table.
* i.e. scale so that F = WEIGHT_LUT_SIZE-1
*/
const double formScale = (double) (WEIGHT_LUT_SIZE - 1) / F;
A *= formScale;
B *= formScale;
C *= formScale;
/* F *= formScale; */ /* no need to scale F as we don't use it below here */
args.level = level; args.level = level;
for (j = 0; j < TGSI_QUAD_SIZE; j++) { for (j = 0; j < TGSI_QUAD_SIZE; j++) {
@ -2309,22 +2265,23 @@ img_filter_2d_ewa(const struct sp_sampler_view *sp_sview,
* and incrementally update the value of Ax^2+Bxy*Cy^2; when this * and incrementally update the value of Ax^2+Bxy*Cy^2; when this
* value, q, is less than F, we're inside the ellipse * value, q, is less than F, we're inside the ellipse
*/ */
float tex_u = -0.5F + s[j] * texture->width0 * scaling; const float tex_u = -0.5F + s[j] * texture->width0 * scaling;
float tex_v = -0.5F + t[j] * texture->height0 * scaling; const float tex_v = -0.5F + t[j] * texture->height0 * scaling;
int u0 = (int) floorf(tex_u - box_u); const int u0 = (int) floorf(tex_u - box_u);
int u1 = (int) ceilf(tex_u + box_u); const int u1 = (int) ceilf(tex_u + box_u);
int v0 = (int) floorf(tex_v - box_v); const int v0 = (int) floorf(tex_v - box_v);
int v1 = (int) ceilf(tex_v + box_v); const int v1 = (int) ceilf(tex_v + box_v);
const float U = u0 - tex_u;
float num[4] = {0.0F, 0.0F, 0.0F, 0.0F}; float num[4] = {0.0F, 0.0F, 0.0F, 0.0F};
buffer_next = 0; unsigned buffer_next = 0;
den = 0; float den = 0;
int v;
args.face_id = faces[j]; args.face_id = faces[j];
U = u0 - tex_u;
for (v = v0; v <= v1; ++v) { for (v = v0; v <= v1; ++v) {
float V = v - tex_v; const float V = v - tex_v;
float dq = A * (2 * U + 1) + B * V; float dq = A * (2 * U + 1) + B * V;
float q = (C * V + B * U) * V + A * U * U; float q = (C * V + B * U) * V + A * U * U;
@ -2338,7 +2295,7 @@ img_filter_2d_ewa(const struct sp_sampler_view *sp_sview,
* should not happen, though * should not happen, though
*/ */
const int qClamped = q >= 0.0F ? q : 0; const int qClamped = q >= 0.0F ? q : 0;
float weight = weightLut[qClamped]; const float weight = weightLut[qClamped];
weight_buffer[buffer_next] = weight; weight_buffer[buffer_next] = weight;
s_buffer[buffer_next] = u / ((float) width); s_buffer[buffer_next] = u / ((float) width);
@ -2458,12 +2415,12 @@ mip_filter_linear_aniso(const struct sp_sampler_view *sp_sview,
float lambda; float lambda;
float lod[TGSI_QUAD_SIZE]; float lod[TGSI_QUAD_SIZE];
float s_to_u = u_minify(texture->width0, psview->u.tex.first_level); const float s_to_u = u_minify(texture->width0, psview->u.tex.first_level);
float t_to_v = u_minify(texture->height0, psview->u.tex.first_level); const float t_to_v = u_minify(texture->height0, psview->u.tex.first_level);
float dudx = (s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]) * s_to_u; const float dudx = (s[QUAD_BOTTOM_RIGHT] - s[QUAD_BOTTOM_LEFT]) * s_to_u;
float dudy = (s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]) * s_to_u; const float dudy = (s[QUAD_TOP_LEFT] - s[QUAD_BOTTOM_LEFT]) * s_to_u;
float dvdx = (t[QUAD_BOTTOM_RIGHT] - t[QUAD_BOTTOM_LEFT]) * t_to_v; const float dvdx = (t[QUAD_BOTTOM_RIGHT] - t[QUAD_BOTTOM_LEFT]) * t_to_v;
float dvdy = (t[QUAD_TOP_LEFT] - t[QUAD_BOTTOM_LEFT]) * t_to_v; const float dvdy = (t[QUAD_TOP_LEFT] - t[QUAD_BOTTOM_LEFT]) * t_to_v;
struct img_filter_args args; struct img_filter_args args;
if (filt_args->control == TGSI_SAMPLER_LOD_BIAS || if (filt_args->control == TGSI_SAMPLER_LOD_BIAS ||
@ -2473,8 +2430,8 @@ mip_filter_linear_aniso(const struct sp_sampler_view *sp_sview,
/* note: instead of working with Px and Py, we will use the /* note: instead of working with Px and Py, we will use the
* squared length instead, to avoid sqrt. * squared length instead, to avoid sqrt.
*/ */
float Px2 = dudx * dudx + dvdx * dvdx; const float Px2 = dudx * dudx + dvdx * dvdx;
float Py2 = dudy * dudy + dvdy * dvdy; const float Py2 = dudy * dudy + dvdy * dvdy;
float Pmax2; float Pmax2;
float Pmin2; float Pmin2;
@ -2585,7 +2542,7 @@ mip_filter_linear_2d_linear_repeat_POT(
compute_lambda_lod(sp_sview, sp_samp, s, t, p, lod_in, filt_args->control, lod); compute_lambda_lod(sp_sview, sp_samp, s, t, p, lod_in, filt_args->control, lod);
for (j = 0; j < TGSI_QUAD_SIZE; j++) { for (j = 0; j < TGSI_QUAD_SIZE; j++) {
int level0 = psview->u.tex.first_level + (int)lod[j]; const int level0 = psview->u.tex.first_level + (int)lod[j];
struct img_filter_args args; struct img_filter_args args;
/* Catches both negative and large values of level0: /* Catches both negative and large values of level0:
*/ */
@ -2605,7 +2562,7 @@ mip_filter_linear_2d_linear_repeat_POT(
} }
else { else {
float levelBlend = frac(lod[j]); const float levelBlend = frac(lod[j]);
float rgbax[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]; float rgbax[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE];
int c; int c;
@ -2672,9 +2629,14 @@ sample_compare(const struct sp_sampler_view *sp_sview,
int j, v; int j, v;
int k[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]; int k[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE];
float pc[4]; float pc[4];
const struct util_format_description *format_desc; const struct util_format_description *format_desc =
unsigned chan_type; util_format_description(sp_sview->base.format);
bool is_gather = (control == TGSI_SAMPLER_GATHER); /* not entirely sure we couldn't end up with non-valid swizzle here */
const unsigned chan_type =
format_desc->swizzle[0] <= UTIL_FORMAT_SWIZZLE_W ?
format_desc->channel[format_desc->swizzle[0]].type :
UTIL_FORMAT_TYPE_FLOAT;
const bool is_gather = (control == TGSI_SAMPLER_GATHER);
/** /**
* Compare texcoord 'p' (aka R) against texture value 'rgba[0]' * Compare texcoord 'p' (aka R) against texture value 'rgba[0]'
@ -2701,11 +2663,6 @@ sample_compare(const struct sp_sampler_view *sp_sview,
pc[3] = p[3]; pc[3] = p[3];
} }
format_desc = util_format_description(sp_sview->base.format);
/* not entirely sure we couldn't end up with non-valid swizzle here */
chan_type = format_desc->swizzle[0] <= UTIL_FORMAT_SWIZZLE_W ?
format_desc->channel[format_desc->swizzle[0]].type :
UTIL_FORMAT_TYPE_FLOAT;
if (chan_type != UTIL_FORMAT_TYPE_FLOAT) { if (chan_type != UTIL_FORMAT_TYPE_FLOAT) {
/* /*
* clamping is a result of conversion to texture format, hence * clamping is a result of conversion to texture format, hence
@ -3280,24 +3237,24 @@ sp_get_texels(const struct sp_sampler_view *sp_sview,
const struct pipe_resource *texture = sp_sview->base.texture; const struct pipe_resource *texture = sp_sview->base.texture;
int j, c; int j, c;
const float *tx; const float *tx;
int width, height, depth; /* TODO write a better test for LOD */
const unsigned level =
sp_sview->base.target == PIPE_BUFFER ? 0 :
CLAMP(lod[0] + sp_sview->base.u.tex.first_level,
sp_sview->base.u.tex.first_level,
sp_sview->base.u.tex.last_level);
const int width = u_minify(texture->width0, level);
const int height = u_minify(texture->height0, level);
const int depth = u_minify(texture->depth0, level);
addr.value = 0; addr.value = 0;
/* TODO write a better test for LOD */ addr.bits.level = level;
addr.bits.level = sp_sview->base.target == PIPE_BUFFER ? 0 :
CLAMP(lod[0] + sp_sview->base.u.tex.first_level,
sp_sview->base.u.tex.first_level,
sp_sview->base.u.tex.last_level);
width = u_minify(texture->width0, addr.bits.level);
height = u_minify(texture->height0, addr.bits.level);
depth = u_minify(texture->depth0, addr.bits.level);
switch (sp_sview->base.target) { switch (sp_sview->base.target) {
case PIPE_BUFFER: case PIPE_BUFFER:
case PIPE_TEXTURE_1D: case PIPE_TEXTURE_1D:
for (j = 0; j < TGSI_QUAD_SIZE; j++) { for (j = 0; j < TGSI_QUAD_SIZE; j++) {
int x = CLAMP(v_i[j] + offset[0], 0, width - 1); const int x = CLAMP(v_i[j] + offset[0], 0, width - 1);
tx = get_texel_2d_no_border(sp_sview, addr, x, 0); tx = get_texel_2d_no_border(sp_sview, addr, x, 0);
for (c = 0; c < 4; c++) { for (c = 0; c < 4; c++) {
rgba[c][j] = tx[c]; rgba[c][j] = tx[c];
@ -3306,9 +3263,9 @@ sp_get_texels(const struct sp_sampler_view *sp_sview,
break; break;
case PIPE_TEXTURE_1D_ARRAY: case PIPE_TEXTURE_1D_ARRAY:
for (j = 0; j < TGSI_QUAD_SIZE; j++) { for (j = 0; j < TGSI_QUAD_SIZE; j++) {
int x = CLAMP(v_i[j] + offset[0], 0, width - 1); const int x = CLAMP(v_i[j] + offset[0], 0, width - 1);
int y = CLAMP(v_j[j], sp_sview->base.u.tex.first_layer, const int y = CLAMP(v_j[j], sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer); sp_sview->base.u.tex.last_layer);
tx = get_texel_2d_no_border(sp_sview, addr, x, y); tx = get_texel_2d_no_border(sp_sview, addr, x, y);
for (c = 0; c < 4; c++) { for (c = 0; c < 4; c++) {
rgba[c][j] = tx[c]; rgba[c][j] = tx[c];
@ -3318,8 +3275,8 @@ sp_get_texels(const struct sp_sampler_view *sp_sview,
case PIPE_TEXTURE_2D: case PIPE_TEXTURE_2D:
case PIPE_TEXTURE_RECT: case PIPE_TEXTURE_RECT:
for (j = 0; j < TGSI_QUAD_SIZE; j++) { for (j = 0; j < TGSI_QUAD_SIZE; j++) {
int x = CLAMP(v_i[j] + offset[0], 0, width - 1); const int x = CLAMP(v_i[j] + offset[0], 0, width - 1);
int y = CLAMP(v_j[j] + offset[1], 0, height - 1); const int y = CLAMP(v_j[j] + offset[1], 0, height - 1);
tx = get_texel_2d_no_border(sp_sview, addr, x, y); tx = get_texel_2d_no_border(sp_sview, addr, x, y);
for (c = 0; c < 4; c++) { for (c = 0; c < 4; c++) {
rgba[c][j] = tx[c]; rgba[c][j] = tx[c];
@ -3328,10 +3285,10 @@ sp_get_texels(const struct sp_sampler_view *sp_sview,
break; break;
case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_2D_ARRAY:
for (j = 0; j < TGSI_QUAD_SIZE; j++) { for (j = 0; j < TGSI_QUAD_SIZE; j++) {
int x = CLAMP(v_i[j] + offset[0], 0, width - 1); const int x = CLAMP(v_i[j] + offset[0], 0, width - 1);
int y = CLAMP(v_j[j] + offset[1], 0, height - 1); const int y = CLAMP(v_j[j] + offset[1], 0, height - 1);
int layer = CLAMP(v_k[j], sp_sview->base.u.tex.first_layer, const int layer = CLAMP(v_k[j], sp_sview->base.u.tex.first_layer,
sp_sview->base.u.tex.last_layer); sp_sview->base.u.tex.last_layer);
tx = get_texel_3d_no_border(sp_sview, addr, x, y, layer); tx = get_texel_3d_no_border(sp_sview, addr, x, y, layer);
for (c = 0; c < 4; c++) { for (c = 0; c < 4; c++) {
rgba[c][j] = tx[c]; rgba[c][j] = tx[c];
@ -3480,7 +3437,7 @@ softpipe_create_sampler_view(struct pipe_context *pipe,
const struct pipe_sampler_view *templ) const struct pipe_sampler_view *templ)
{ {
struct sp_sampler_view *sview = CALLOC_STRUCT(sp_sampler_view); struct sp_sampler_view *sview = CALLOC_STRUCT(sp_sampler_view);
struct softpipe_resource *spr = (struct softpipe_resource *)resource; const struct softpipe_resource *spr = (struct softpipe_resource *)resource;
if (sview) { if (sview) {
struct pipe_sampler_view *view = &sview->base; struct pipe_sampler_view *view = &sview->base;