#include "pipe/p_defines.h"
#include "pipe/p_shader_tokens.h"
#include "util/u_math.h"
-#include "util/u_format.h"
+#include "util/format/u_format.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "sp_quad.h" /* only for #define QUAD_* tokens */
wrap_linear_clamp_to_border(float s, unsigned size, int offset,
int *icoord0, int *icoord1, float *w)
{
- const float min = -0.5F;
+ const float min = -1.0F;
const float max = (float)size + 0.5F;
const float u = CLAMP(s * size + offset, min, max) - 0.5f;
*icoord0 = util_ifloor(u);
{
int flr;
float u;
+ bool no_mirror;
s += (float)offset / size;
flr = util_ifloor(s);
+ no_mirror = !(flr & 1);
+
u = frac(s);
- if (flr & 1)
+ if (no_mirror) {
+ u = u * size - 0.5F;
+ } else {
u = 1.0F - u;
- u = u * size - 0.5F;
+ u = u * size + 0.5F;
+ }
+
*icoord0 = util_ifloor(u);
- *icoord1 = *icoord0 + 1;
+ *icoord1 = (no_mirror) ? *icoord0 + 1 : *icoord0 - 1;
+
if (*icoord0 < 0)
- *icoord0 = 0;
+ *icoord0 = 1 + *icoord0;
+ if (*icoord0 >= (int) size)
+ *icoord0 = size - 1;
+
if (*icoord1 >= (int) size)
*icoord1 = size - 1;
- *w = frac(u);
+ if (*icoord1 < 0)
+ *icoord1 = 1 + *icoord1;
+
+ *w = (no_mirror) ? frac(u) : frac(1.0f - u);
}
}
-static float
-compute_lambda_vert_explicite_gradients(UNUSED const struct sp_sampler_view *sview,
- UNUSED const float derivs[3][2][TGSI_QUAD_SIZE],
- UNUSED int quad)
-{
- return 0.0f;
-}
-
-
compute_lambda_from_grad_func
softpipe_get_lambda_from_grad_func(const struct pipe_sampler_view *view,
enum pipe_shader_type shader)
if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level)) {
- return sp_samp->base.border_color.f;
+ return sp_sview->border_color.f;
}
else {
return get_texel_2d_no_border( sp_sview, addr, x, y );
if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level) ||
z < 0 || z >= (int) u_minify(texture->depth0, level)) {
- return sp_samp->base.border_color.f;
+ return sp_sview->border_color.f;
}
else {
return get_texel_3d_no_border( sp_sview, addr, x, y, z );
const unsigned level = addr.bits.level;
if (x < 0 || x >= (int) u_minify(texture->width0, level)) {
- return sp_samp->base.border_color.f;
+ return sp_sview->border_color.f;
}
else {
return get_texel_2d_no_border(sp_sview, addr, x, y);
if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level)) {
- return sp_samp->base.border_color.f;
+ return sp_sview->border_color.f;
}
else {
return get_texel_3d_no_border(sp_sview, addr, x, y, layer);
if (x < 0 || x >= (int) u_minify(texture->width0, level) ||
y < 0 || y >= (int) u_minify(texture->height0, level)) {
- return sp_samp->base.border_color.f;
+ return sp_sview->border_color.f;
}
else {
return get_texel_3d_no_border(sp_sview, addr, x, y, layer);
const struct pipe_resource *texture = sp_sview->base.texture;
const int width = u_minify(texture->width0, args->level);
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;
+ const int layerface = CLAMP(6 * util_ifloor(args->p + 0.5f) + 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;
const float *out;
const struct pipe_resource *texture = sp_sview->base.texture;
const int width = u_minify(texture->width0, args->level);
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);
+
+ const int layer = CLAMP(6 * util_ifloor(args->p + 0.5f) + 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 */
union tex_tile_address addr;
switch (control) {
case TGSI_SAMPLER_LOD_NONE:
case TGSI_SAMPLER_LOD_ZERO:
- /* XXX FIXME */
- case TGSI_SAMPLER_DERIVS_EXPLICIT:
lod[0] = lod[1] = lod[2] = lod[3] = CLAMP(biased_lambda, min_lod, max_lod);
break;
+ case TGSI_SAMPLER_DERIVS_EXPLICIT:
+ for (i = 0; i < TGSI_QUAD_SIZE; i++)
+ lod[i] = lod_in[i];
+ break;
case TGSI_SAMPLER_LOD_BIAS:
for (i = 0; i < TGSI_QUAD_SIZE; i++) {
lod[i] = biased_lambda + lod_in[i];
const float s[TGSI_QUAD_SIZE],
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
+ const float derivs[3][2][TGSI_QUAD_SIZE],
const float lod_in[TGSI_QUAD_SIZE],
enum tgsi_sampler_control control,
float lod[TGSI_QUAD_SIZE])
switch (control) {
case TGSI_SAMPLER_LOD_NONE:
- /* XXX FIXME */
- case TGSI_SAMPLER_DERIVS_EXPLICIT:
lambda = sp_sview->compute_lambda(sp_sview, s, t, p) + lod_bias;
lod[0] = lod[1] = lod[2] = lod[3] = lambda;
break;
+ case TGSI_SAMPLER_DERIVS_EXPLICIT:
+ for (i = 0; i < TGSI_QUAD_SIZE; i++)
+ lod[i] = sp_sview->compute_lambda_from_grad(sp_sview, derivs, i);
+ break;
case TGSI_SAMPLER_LOD_BIAS:
lambda = sp_sview->compute_lambda(sp_sview, s, t, p) + lod_bias;
for (i = 0; i < TGSI_QUAD_SIZE; i++) {
const float s[TGSI_QUAD_SIZE],
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
+ float derivs[3][2][TGSI_QUAD_SIZE],
const float lod_in[TGSI_QUAD_SIZE],
enum tgsi_sampler_control control,
float lod[TGSI_QUAD_SIZE])
int i;
compute_lambda_lod_unclamped(sp_sview, sp_samp,
- s, t, p, lod_in, control, lod);
+ s, t, p, derivs, lod_in, control, lod);
for (i = 0; i < TGSI_QUAD_SIZE; i++) {
lod[i] = CLAMP(lod[i], min_lod, max_lod);
}
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
int gather_comp,
- const float c0[TGSI_QUAD_SIZE],
- const float lod_in[TGSI_QUAD_SIZE],
+ const float lod[TGSI_QUAD_SIZE],
const struct filter_args *filt_args,
float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
{
const struct pipe_sampler_view *psview = &sp_sview->base;
int j;
- float lod[TGSI_QUAD_SIZE];
struct img_filter_args args;
- compute_lambda_lod(sp_sview, sp_samp, s, t, p, lod_in, filt_args->control, lod);
-
args.offset = filt_args->offset;
args.gather_only = filt_args->control == TGSI_SAMPLER_GATHER;
args.gather_comp = gather_comp;
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
int gather_component,
- const float c0[TGSI_QUAD_SIZE],
- const float lod_in[TGSI_QUAD_SIZE],
+ const float lod[TGSI_QUAD_SIZE],
const struct filter_args *filt_args,
float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
{
const struct pipe_sampler_view *psview = &sp_sview->base;
- float lod[TGSI_QUAD_SIZE];
int j;
struct img_filter_args args;
args.gather_only = filt_args->control == TGSI_SAMPLER_GATHER;
args.gather_comp = gather_component;
- compute_lambda_lod(sp_sview, sp_samp, s, t, p, lod_in, filt_args->control, lod);
-
for (j = 0; j < TGSI_QUAD_SIZE; j++) {
args.s = s[j];
args.t = t[j];
args.p = p[j];
args.face_id = filt_args->faces[j];
- if (lod[j] <= 0.0 && !args.gather_only) {
+ if (lod[j] <= 0.0f && !args.gather_only) {
args.level = psview->u.tex.first_level;
mag_filter(sp_sview, sp_samp, &args, &rgba[0][j]);
} else {
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
int gather_component,
- const float c0[TGSI_QUAD_SIZE],
- const float lod_in[TGSI_QUAD_SIZE],
+ const float lod[TGSI_QUAD_SIZE],
const struct filter_args *filt_args,
float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
{
- float lod[TGSI_QUAD_SIZE];
int j;
struct img_filter_args args;
args.gather_only = filt_args->control == TGSI_SAMPLER_GATHER;
args.gather_comp = gather_component;
- compute_lambda_lod(sp_sview, sp_samp, s, t, p, lod_in, filt_args->control, lod);
-
for (j = 0; j < TGSI_QUAD_SIZE; j++) {
args.s = s[j];
args.t = t[j];
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
int gather_comp,
- const float c0[TGSI_QUAD_SIZE],
const float lod_in[TGSI_QUAD_SIZE],
const struct filter_args *filt_args,
float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
for (i = 0; i < WEIGHT_LUT_SIZE; ++i) {
const float alpha = 2;
const float r2 = (float) i / (float) (WEIGHT_LUT_SIZE - 1);
- const float weight = (float) exp(-alpha * r2);
+ const float weight = (float) expf(-alpha * r2);
lut[i] = weight;
}
weightLut = lut;
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
UNUSED int gather_comp,
- const float c0[TGSI_QUAD_SIZE],
const float lod_in[TGSI_QUAD_SIZE],
const struct filter_args *filt_args,
float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
int gather_comp,
- const float c0[TGSI_QUAD_SIZE],
- const float lod_in[TGSI_QUAD_SIZE],
+ const float lod[TGSI_QUAD_SIZE],
const struct filter_args *filt_args,
float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE])
{
const struct pipe_sampler_view *psview = &sp_sview->base;
int j;
- float lod[TGSI_QUAD_SIZE];
-
- compute_lambda_lod(sp_sview, sp_samp, s, t, p, lod_in, filt_args->control, lod);
for (j = 0; j < TGSI_QUAD_SIZE; j++) {
const int level0 = psview->u.tex.first_level + (int)lod[j];
&funcs, &min_img_filter, &mag_img_filter);
funcs->filter(sp_sview, sp_samp, min_img_filter, mag_img_filter,
- s, t, p, gather_comp, c0, lod, filt_args, rgba);
+ s, t, p, gather_comp, lod, filt_args, rgba);
if (sp_samp->base.compare_mode != PIPE_TEX_COMPARE_NONE) {
sample_compare(sp_sview, sp_samp, c0, filt_args->control, rgba);
* deriviates to compute the LOD. Doing so (near cube edges
* anyway) gives us pretty much random values.
*/
- {
- /* use the average of the four pixel's texcoords to choose the face */
- const float rx = 0.25F * (s[0] + s[1] + s[2] + s[3]);
- const float ry = 0.25F * (t[0] + t[1] + t[2] + t[3]);
- const float rz = 0.25F * (p[0] + p[1] + p[2] + p[3]);
+ for (j = 0; j < TGSI_QUAD_SIZE; j++) {
+ const float rx = s[j], ry = t[j], rz = p[j];
const float arx = fabsf(rx), ary = fabsf(ry), arz = fabsf(rz);
if (arx >= ary && arx >= arz) {
const float sign = (rx >= 0.0F) ? 1.0F : -1.0F;
const uint face = (rx >= 0.0F) ?
PIPE_TEX_FACE_POS_X : PIPE_TEX_FACE_NEG_X;
- for (j = 0; j < TGSI_QUAD_SIZE; j++) {
- const float ima = -0.5F / fabsf(s[j]);
- ssss[j] = sign * p[j] * ima + 0.5F;
- tttt[j] = t[j] * ima + 0.5F;
- faces[j] = face;
- }
+ const float ima = -0.5F / fabsf(s[j]);
+ ssss[j] = sign * p[j] * ima + 0.5F;
+ tttt[j] = t[j] * ima + 0.5F;
+ faces[j] = face;
}
else if (ary >= arx && ary >= arz) {
const float sign = (ry >= 0.0F) ? 1.0F : -1.0F;
const uint face = (ry >= 0.0F) ?
PIPE_TEX_FACE_POS_Y : PIPE_TEX_FACE_NEG_Y;
- for (j = 0; j < TGSI_QUAD_SIZE; j++) {
- const float ima = -0.5F / fabsf(t[j]);
- ssss[j] = -s[j] * ima + 0.5F;
- tttt[j] = sign * -p[j] * ima + 0.5F;
- faces[j] = face;
- }
+ const float ima = -0.5F / fabsf(t[j]);
+ ssss[j] = -s[j] * ima + 0.5F;
+ tttt[j] = sign * -p[j] * ima + 0.5F;
+ faces[j] = face;
}
else {
const float sign = (rz >= 0.0F) ? 1.0F : -1.0F;
const uint face = (rz >= 0.0F) ?
PIPE_TEX_FACE_POS_Z : PIPE_TEX_FACE_NEG_Z;
- for (j = 0; j < TGSI_QUAD_SIZE; j++) {
- const float ima = -0.5F / fabsf(p[j]);
- ssss[j] = sign * -s[j] * ima + 0.5F;
- tttt[j] = t[j] * ima + 0.5F;
- faces[j] = face;
- }
+ const float ima = -0.5F / fabsf(p[j]);
+ ssss[j] = sign * -s[j] * ima + 0.5F;
+ tttt[j] = t[j] * ima + 0.5F;
+ faces[j] = face;
}
}
}
case PIPE_TEXTURE_2D:
case PIPE_TEXTURE_2D_ARRAY:
case PIPE_TEXTURE_RECT:
+ return compute_lambda_2d;
case PIPE_TEXTURE_CUBE:
case PIPE_TEXTURE_CUBE_ARRAY:
- return compute_lambda_2d;
+ return compute_lambda_cube;
case PIPE_TEXTURE_3D:
return compute_lambda_3d;
default:
#ifdef DEBUG
/*
* This is possibly too lenient, but the primary reason is just
- * to catch state trackers which forget to initialize this, so
+ * to catch gallium frontends which forget to initialize this, so
* it only catches clearly impossible view targets.
*/
if (view->target != resource->target) {
pc[2] = p[2];
pc[3] = p[3];
}
-
}
static void
const float t[TGSI_QUAD_SIZE],
const float p[TGSI_QUAD_SIZE],
const float c0[TGSI_QUAD_SIZE],
- const float lod[TGSI_QUAD_SIZE],
+ const float lod_in[TGSI_QUAD_SIZE],
float derivs[3][2][TGSI_QUAD_SIZE],
const int8_t offset[3],
enum tgsi_sampler_control control,
{
const struct sp_tgsi_sampler *sp_tgsi_samp =
sp_tgsi_sampler_cast_c(tgsi_sampler);
- const struct sp_sampler_view *sp_sview;
+ struct sp_sampler_view sp_sview;
const struct sp_sampler *sp_samp;
struct filter_args filt_args;
float compare_values[TGSI_QUAD_SIZE];
+ float lod[TGSI_QUAD_SIZE];
+ int c;
assert(sview_index < PIPE_MAX_SHADER_SAMPLER_VIEWS);
assert(sampler_index < PIPE_MAX_SAMPLERS);
assert(sp_tgsi_samp->sp_sampler[sampler_index]);
- sp_sview = &sp_tgsi_samp->sp_sview[sview_index];
+ memcpy(&sp_sview, &sp_tgsi_samp->sp_sview[sview_index],
+ sizeof(struct sp_sampler_view));
sp_samp = sp_tgsi_samp->sp_sampler[sampler_index];
+
+ if (util_format_is_unorm(sp_sview.base.format)) {
+ for (c = 0; c < TGSI_NUM_CHANNELS; c++)
+ sp_sview.border_color.f[c] = CLAMP(sp_samp->base.border_color.f[c],
+ 0.0f, 1.0f);
+ } else if (util_format_is_snorm(sp_sview.base.format)) {
+ for (c = 0; c < TGSI_NUM_CHANNELS; c++)
+ sp_sview.border_color.f[c] = CLAMP(sp_samp->base.border_color.f[c],
+ -1.0f, 1.0f);
+ } else {
+ memcpy(sp_sview.border_color.f, sp_samp->base.border_color.f,
+ TGSI_NUM_CHANNELS * sizeof(float));
+ }
+
/* always have a view here but texture is NULL if no sampler view was set. */
- if (!sp_sview->base.texture) {
+ if (!sp_sview.base.texture) {
int i, j;
for (j = 0; j < TGSI_NUM_CHANNELS; j++) {
for (i = 0; i < TGSI_QUAD_SIZE; i++) {
}
if (sp_samp->base.compare_mode != PIPE_TEX_COMPARE_NONE)
- prepare_compare_values(sp_sview->base.target, p, c0, lod, compare_values);
+ prepare_compare_values(sp_sview.base.target, p, c0, lod_in, compare_values);
filt_args.control = control;
filt_args.offset = offset;
- int gather_comp = get_gather_component(lod);
+ int gather_comp = get_gather_component(lod_in);
+ compute_lambda_lod(&sp_sview, sp_samp, s, t, p, derivs, lod_in, control, lod);
- if (sp_sview->need_cube_convert) {
+ if (sp_sview.need_cube_convert) {
float cs[TGSI_QUAD_SIZE];
float ct[TGSI_QUAD_SIZE];
float cp[TGSI_QUAD_SIZE];
uint faces[TGSI_QUAD_SIZE];
- convert_cube(sp_sview, sp_samp, s, t, p, c0, cs, ct, cp, faces);
+ convert_cube(&sp_sview, sp_samp, s, t, p, c0, cs, ct, cp, faces);
filt_args.faces = faces;
- sample_mip(sp_sview, sp_samp, cs, ct, cp, compare_values, gather_comp, lod, &filt_args, rgba);
+ sample_mip(&sp_sview, sp_samp, cs, ct, cp, compare_values, gather_comp, lod, &filt_args, rgba);
} else {
static const uint zero_faces[TGSI_QUAD_SIZE] = {0, 0, 0, 0};
filt_args.faces = zero_faces;
- sample_mip(sp_sview, sp_samp, s, t, p, compare_values, gather_comp, lod, &filt_args, rgba);
+ sample_mip(&sp_sview, sp_samp, s, t, p, compare_values, gather_comp, lod, &filt_args, rgba);
}
}
float lod[TGSI_QUAD_SIZE])
{
static const float lod_in[TGSI_QUAD_SIZE] = { 0.0, 0.0, 0.0, 0.0 };
+ static const float dummy_grad[3][2][TGSI_QUAD_SIZE];
const struct sp_tgsi_sampler *sp_tgsi_samp =
sp_tgsi_sampler_cast_c(tgsi_sampler);
}
return;
}
-
- if (sp_sview->need_cube_convert) {
- float cs[TGSI_QUAD_SIZE];
- float ct[TGSI_QUAD_SIZE];
- float cp[TGSI_QUAD_SIZE];
- uint unused_faces[TGSI_QUAD_SIZE];
-
- convert_cube(sp_sview, sp_samp, s, t, p, c0, cs, ct, cp, unused_faces);
- compute_lambda_lod_unclamped(sp_sview, sp_samp,
- cs, ct, cp, lod_in, control, lod);
- } else {
- compute_lambda_lod_unclamped(sp_sview, sp_samp,
- s, t, p, lod_in, control, lod);
- }
+ compute_lambda_lod_unclamped(sp_sview, sp_samp,
+ s, t, p, dummy_grad, lod_in, control, lod);
get_filters(sp_sview, sp_samp, control, &funcs, NULL, NULL);
funcs->relative_level(sp_sview, sp_samp, lod, mipmap);
projects / mesa.git / blobdiff