diff options
| author | Michel Dänzer <[email protected]> | 2013-02-13 12:54:13 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2013-02-21 09:14:36 +0100 |
| commit | 18272c9b1b530ad6d2091b647c062793f94b5351 (patch) | |
| tree | d7bf7771fdcc52e51179ce6b1a199235029424fd /src/gallium/drivers/radeonsi/radeonsi_shader.c | |
| parent | 0d51906c0754b1c1a2964af50c55306bce9ab224 (diff) | |
radeonsi: Fix up and enable flat shading.
Requires corresponding LLVM R600 backend fix to work correctly, but even
without that it doesn't hang anymore.
13 more little piglits.
Depends on LLVM: r175193, r175733
NOTE: This is a candidate for the 9.1 branch.
Diffstat (limited to 'src/gallium/drivers/radeonsi/radeonsi_shader.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_shader.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_shader.c b/src/gallium/drivers/radeonsi/radeonsi_shader.c index 7c57f4c2f3e..704f859efd7 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_shader.c +++ b/src/gallium/drivers/radeonsi/radeonsi_shader.c @@ -301,14 +301,8 @@ static void declare_input_fs( /* XXX: Handle all possible interpolation modes */ switch (decl->Interp.Interpolate) { case TGSI_INTERPOLATE_COLOR: - /* XXX: Flat shading hangs the GPU */ - if (si_shader_ctx->rctx->queued.named.rasterizer && - si_shader_ctx->rctx->queued.named.rasterizer->flatshade) { -#if 0 + if (si_shader_ctx->key.flatshade) { intr_name = "llvm.SI.fs.interp.constant"; -#else - intr_name = "llvm.SI.fs.interp.linear.center"; -#endif } else { if (decl->Interp.Centroid) intr_name = "llvm.SI.fs.interp.persp.centroid"; @@ -317,11 +311,8 @@ static void declare_input_fs( } break; case TGSI_INTERPOLATE_CONSTANT: - /* XXX: Flat shading hangs the GPU */ -#if 0 intr_name = "llvm.SI.fs.interp.constant"; break; -#endif case TGSI_INTERPOLATE_LINEAR: if (decl->Interp.Centroid) intr_name = "llvm.SI.fs.interp.linear.centroid"; |