fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-08 16:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

t_dd_dmatmp: Disallow flat shading when rendering quad strips via tri strips

Browse source 
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@linux.intel.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ville Syrjälä 2015-03-23 14:47:19 +02:00 • committed by Ian Romanick
parent b15b4581d1
commit 83d511e190
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/tnl_dd/t_dd_dmatmp.h
View file

@ -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. */