#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 */
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;
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;
#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) {
{
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_in, 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_in);
- compute_lambda_lod(sp_sview,sp_samp, s, t, p, derivs, lod_in, control, lod);
+ 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);
}
}