summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl_dd
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2015-09-14 12:36:33 -0700
committerIan Romanick <ian.d.romanick@intel.com>2015-09-23 09:56:48 -0700
commit249ba09f59af870dc55eacede5b1e164873c397d (patch)
tree4c0444de8eb02dcf9f6e4835f1b10b2228a7d61b /src/mesa/tnl_dd
parent25543d8ec506ef32599af6f5e0dd735e01b39909 (diff)
downloadexternal_mesa3d-249ba09f59af870dc55eacede5b1e164873c397d.zip
external_mesa3d-249ba09f59af870dc55eacede5b1e164873c397d.tar.gz
external_mesa3d-249ba09f59af870dc55eacede5b1e164873c397d.tar.bz2
t_dd_dmatmp: Remove HAVE_QUAD_STRIPS support
Two drivers use this file, and neither supports quad strips. No piglit regressions on i915 (G33) or radeon (Radeon 7500). Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/tnl_dd')
-rw-r--r--src/mesa/tnl_dd/t_dd_dmatmp.h41
1 files changed, 8 insertions, 33 deletions
diff --git a/src/mesa/tnl_dd/t_dd_dmatmp.h b/src/mesa/tnl_dd/t_dd_dmatmp.h
index b127605..5da0eae 100644
--- a/src/mesa/tnl_dd/t_dd_dmatmp.h
+++ b/src/mesa/tnl_dd/t_dd_dmatmp.h
@@ -43,6 +43,10 @@
#error "must have at least triangles to use render template"
#endif
+#if HAVE_QUAD_STRIPS
+#error "quad strips not supported by render template"
+#endif
+
#if !HAVE_ELTS
#define ELTS_VARS(buf)
#define ALLOC_ELTS(nr) 0
@@ -418,33 +422,9 @@ static void TAG(render_quad_strip_verts)( struct gl_context *ctx,
{
GLuint j, nr;
- if (HAVE_QUAD_STRIPS) {
- LOCAL_VARS;
- GLuint j, nr;
- int dmasz = GET_SUBSEQUENT_VB_MAX_VERTS();
- int currentsz;
-
- INIT(GL_QUAD_STRIP);
-
- currentsz = GET_CURRENT_VB_MAX_VERTS();
- if (currentsz < 8) {
- currentsz = dmasz;
- }
-
- dmasz -= (dmasz & 2);
- currentsz -= (currentsz & 2);
-
- for (j = 0; j + 3 < count; j += nr - 2 ) {
- nr = MIN2( currentsz, count - j );
- TAG(emit_verts)(ctx, start + j, nr, ALLOC_VERTS(nr));
- currentsz = dmasz;
- }
-
- FLUSH();
-
- } else if (HAVE_TRI_STRIPS &&
- ctx->Light.ShadeModel == GL_FLAT &&
- TNL_CONTEXT(ctx)->vb.AttribPtr[_TNL_ATTRIB_COLOR0]->stride) {
+ if (HAVE_TRI_STRIPS &&
+ ctx->Light.ShadeModel == GL_FLAT &&
+ TNL_CONTEXT(ctx)->vb.AttribPtr[_TNL_ATTRIB_COLOR0]->stride) {
if (HAVE_ELTS) {
LOCAL_VARS;
int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
@@ -999,9 +979,7 @@ static void TAG(render_quad_strip_elts)( struct gl_context *ctx,
GLuint count,
GLuint flags )
{
- if (HAVE_QUAD_STRIPS && 0) {
- }
- else if (HAVE_TRI_STRIPS) {
+ if (HAVE_TRI_STRIPS) {
LOCAL_VARS;
GLuint *elts = TNL_CONTEXT(ctx)->vb.Elts;
int dmasz = GET_SUBSEQUENT_VB_MAX_ELTS();
@@ -1216,9 +1194,6 @@ static GLboolean TAG(validate_render)( struct gl_context *ctx,
case GL_QUAD_STRIP:
if (VB->Elts) {
ok = HAVE_TRI_STRIPS;
- }
- else if (HAVE_QUAD_STRIPS) {
- ok = GL_TRUE;
} else if (HAVE_TRI_STRIPS &&
ctx->Light.ShadeModel == GL_FLAT &&
VB->AttribPtr[_TNL_ATTRIB_COLOR0]->stride != 0) {