Mesa (master): t_dd_dmatmp: Disallow flat shading when rendering quad strips via tri strips
Ian Romanick
idr at kemper.freedesktop.org
Tue Oct 6 19:19:46 UTC 2015
Module: Mesa
Branch: master
Commit: 83d511e1904b565490e6c8335a1d329e0fcf9c41
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=83d511e1904b565490e6c8335a1d329e0fcf9c41
Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
Date: Mon Mar 23 14:47:19 2015 +0200
t_dd_dmatmp: Disallow flat shading when rendering quad strips via tri strips
When rendering quad strips via tri strips we can't get the provoking
vertex right, so disallow flat shading.
v2: Major rebase on top of Ian's other t_dd_dmatmp.h work.
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/tnl_dd/t_dd_dmatmp.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
index 7d03b02..04182f0 100644
--- a/src/mesa/tnl_dd/t_dd_dmatmp.h
+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
@@ -332,8 +332,7 @@ static void TAG(render_quad_strip_verts)(struct gl_context *ctx,
{
GLuint j, nr;
- if (ctx->Light.ShadeModel != GL_FLAT ||
- !TNL_CONTEXT(ctx)->vb.AttribPtr[_TNL_ATTRIB_COLOR0]->stride) {
+ if (ctx->Light.ShadeModel == GL_SMOOTH) {
LOCAL_VARS;
const unsigned dmasz = GET_SUBSEQUENT_VB_MAX_VERTS() & ~1;
unsigned currentsz;
@@ -463,9 +462,7 @@ static bool TAG(validate_render)(struct gl_context *ctx,
ctx->Light.ProvokingVertex == GL_FIRST_VERTEX_CONVENTION;
break;
case GL_QUAD_STRIP:
- ok = VB->Elts ||
- (ctx->Light.ShadeModel != GL_FLAT ||
- VB->AttribPtr[_TNL_ATTRIB_COLOR0]->stride == 0);
+ ok = VB->Elts || ctx->Light.ShadeModel == GL_SMOOTH;
break;
case GL_QUADS:
ok = true; /* flatshading is ok. */
More information about the mesa-commit
mailing list