OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadcom/vc5: Remove leftover vc4 MSAA lowering setup in the FS key.

Browse Source
This commit is contained in:
Eric Anholt
2018-04-24 15:23:27 -07:00
parent 5710532e9e
commit 503716fa86
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,18 +302,11 @@ struct v3d_key {
uint8_t swizzle[4]; uint8_t swizzle[4];
uint8_t return_size; uint8_t return_size;
uint8_t return_channels; uint8_t return_channels;
union {
struct {
unsigned compare_mode:1; unsigned compare_mode:1;
unsigned compare_func:3; unsigned compare_func:3;
bool clamp_s:1; bool clamp_s:1;
bool clamp_t:1; bool clamp_t:1;
bool clamp_r:1; bool clamp_r:1;
};
struct {
uint16_t msaa_width, msaa_height;
};
};
} tex[V3D_MAX_TEXTURE_SAMPLERS]; } tex[V3D_MAX_TEXTURE_SAMPLERS];
uint8_t ucp_enables; uint8_t ucp_enables;
}; };

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

@@ -363,10 +363,7 @@ vc5_setup_shared_key(struct vc5_context *vc5, struct v3d_key *key,
key->tex[i].swizzle[3] = PIPE_SWIZZLE_W; key->tex[i].swizzle[3] = PIPE_SWIZZLE_W;
} }
if (sampler->texture->nr_samples > 1) { if (sampler) {
key->tex[i].msaa_width = sampler->texture->width0;
key->tex[i].msaa_height = sampler->texture->height0;
} else if (sampler){
key->tex[i].compare_mode = sampler_state->compare_mode; key->tex[i].compare_mode = sampler_state->compare_mode;
key->tex[i].compare_func = sampler_state->compare_func; key->tex[i].compare_func = sampler_state->compare_func;
key->tex[i].clamp_s = key->tex[i].clamp_s =