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

broadcom/vc5: Add PIPE_TEX_WRAP_CLAMP support for linear-filtered textures. 

I already had the texture's wrapping set up to use different behavior for
nearest or linear, so we just needed to saturate the coordinates in linear
mode to get the "proper" blend between the edge and border values.
This commit is contained in:
Eric Anholt 2017-10-24 12:29:39 -07:00
parent e798455330
commit eecdbaa985
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/broadcom/compiler/v3d_compiler.h
View File

@ -294,8 +294,9 @@ struct v3d_key {
struct {
unsigned compare_mode:1;
unsigned compare_func:3;
unsigned wrap_s:3;
unsigned wrap_t:3;
bool clamp_s:1;
bool clamp_t:1;
bool clamp_r:1;
};
struct {
uint16_t msaa_width, msaa_height;

7
src/broadcom/compiler/vir.c
View File

@ -553,6 +553,13 @@ v3d_lower_nir(struct v3d_compile *c)
for (int i = 0; i < ARRAY_SIZE(c->key->tex); i++) {
for (int j = 0; j < 4; j++)
tex_options.swizzles[i][j] = c->key->tex[i].swizzle[j];
if (c->key->tex[i].clamp_s)
tex_options.saturate_s |= 1 << i;
if (c->key->tex[i].clamp_t)
tex_options.saturate_t |= 1 << i;
if (c->key->tex[i].clamp_r)
tex_options.saturate_r |= 1 << i;
}
NIR_PASS_V(c->s, nir_lower_tex, &tex_options);

8
src/gallium/drivers/vc5/vc5_program.c
View File

@ -304,8 +304,12 @@ vc5_setup_shared_key(struct vc5_context *vc5, struct v3d_key *key,
} else if (sampler){
key->tex[i].compare_mode = sampler_state->compare_mode;
key->tex[i].compare_func = sampler_state->compare_func;
key->tex[i].wrap_s = sampler_state->wrap_s;
key->tex[i].wrap_t = sampler_state->wrap_t;
key->tex[i].clamp_s =
sampler_state->wrap_s == PIPE_TEX_WRAP_CLAMP;
key->tex[i].clamp_t =
sampler_state->wrap_t == PIPE_TEX_WRAP_CLAMP;
key->tex[i].clamp_r =
sampler_state->wrap_r == PIPE_TEX_WRAP_CLAMP;
}
}