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

r600g: switch btw flat/linear interpolation

Browse Source 
I am not sure how to properly handle flat shading regarding
non color parameter to fragment shader. It seems we should
still interpolate non color using linear interpolation and
flat shade only apply to color.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
This commit is contained in:
Jerome Glisse
2010-07-28 19:59:38 -04:00
parent 6f0f6c6459
commit 35e044ab56
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/r600/r600_shader.c
View File

@@ -169,7 +169,10 @@ static int r600_pipe_shader_ps(struct pipe_context *ctx, struct r600_context_sta
for (i = 0; i < rshader->ninput; i++) { for (i = 0; i < rshader->ninput; i++) {
tmp = S_028644_SEMANTIC(rshader->input[i].sid); tmp = S_028644_SEMANTIC(rshader->input[i].sid);
tmp |= S_028644_SEL_CENTROID(1); tmp |= S_028644_SEL_CENTROID(1);
tmp |= S_028644_FLAT_SHADE(rshader->flat_shade); if (rshader->input[i].name == TGSI_SEMANTIC_COLOR ||
rshader->input[i].name == TGSI_SEMANTIC_BCOLOR) {
tmp |= S_028644_FLAT_SHADE(rshader->flat_shade);
}
state->states[R600_PS_SHADER__SPI_PS_INPUT_CNTL_0 + i] = tmp; state->states[R600_PS_SHADER__SPI_PS_INPUT_CNTL_0 + i] = tmp;
} }
state->states[R600_PS_SHADER__SPI_PS_IN_CONTROL_0] = S_0286CC_NUM_INTERP(rshader->ninput) | state->states[R600_PS_SHADER__SPI_PS_IN_CONTROL_0] = S_0286CC_NUM_INTERP(rshader->ninput) |
@@ -287,6 +290,7 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
i = ctx->shader->ninput++; i = ctx->shader->ninput++;
ctx->shader->input[i].name = d->Semantic.Name; ctx->shader->input[i].name = d->Semantic.Name;
ctx->shader->input[i].sid = d->Semantic.Index; ctx->shader->input[i].sid = d->Semantic.Index;
ctx->shader->input[i].interpolate = d->Declaration.Interpolate;
ctx->shader->input[i].gpr = ctx->file_offset[TGSI_FILE_INPUT] + i; ctx->shader->input[i].gpr = ctx->file_offset[TGSI_FILE_INPUT] + i;
if (ctx->type == TGSI_PROCESSOR_VERTEX) { if (ctx->type == TGSI_PROCESSOR_VERTEX) {
/* turn input into fetch */ /* turn input into fetch */
@@ -313,6 +317,7 @@ static int tgsi_declaration(struct r600_shader_ctx *ctx)
ctx->shader->output[i].name = d->Semantic.Name; ctx->shader->output[i].name = d->Semantic.Name;
ctx->shader->output[i].sid = d->Semantic.Index; ctx->shader->output[i].sid = d->Semantic.Index;
ctx->shader->output[i].gpr = ctx->file_offset[TGSI_FILE_OUTPUT] + i; ctx->shader->output[i].gpr = ctx->file_offset[TGSI_FILE_OUTPUT] + i;
ctx->shader->output[i].interpolate = d->Declaration.Interpolate;
break; break;
case TGSI_FILE_CONSTANT: case TGSI_FILE_CONSTANT:
case TGSI_FILE_TEMPORARY: case TGSI_FILE_TEMPORARY:

1
src/gallium/drivers/r600/r600_shader.h
View File

@@ -29,6 +29,7 @@ struct r600_shader_io {
unsigned name; unsigned name;
unsigned gpr; unsigned gpr;
int sid; int sid;
unsigned interpolate;
}; };
struct r600_shader { struct r600_shader {

2
src/gallium/drivers/r600/r600_state.c
View File

@@ -692,8 +692,6 @@ static struct radeon_state *r600_rasterizer(struct r600_context *rctx)
struct radeon_state *rstate; struct radeon_state *rstate;
rctx->flat_shade = state->flatshade; rctx->flat_shade = state->flatshade;
rctx->flat_shade = 0;
R600_ERR("flat shade with texture broke tex coord interp\n");
rstate = radeon_state(rscreen->rw, R600_RASTERIZER_TYPE, R600_RASTERIZER); rstate = radeon_state(rscreen->rw, R600_RASTERIZER_TYPE, R600_RASTERIZER);
if (rstate == NULL) if (rstate == NULL)
return NULL; return NULL;