Remove some code that was never hit (bug 11811).

Also added an assertion to check that NR_MAT_ATTRIBS == MAT_ATTRIB_MAX.
In the unlikely event this ever changes, maybe restore the code.
This commit is contained in:
Brian
2007-08-02 08:29:55 -06:00
parent 46ac453196
commit c3e6bfc9e2
+3 -5
View File
@@ -112,6 +112,8 @@ static void init_mat_currval(GLcontext *ctx)
struct gl_client_array *arrays = vbo->mat_currval;
GLuint i;
ASSERT(NR_MAT_ATTRIBS == MAT_ATTRIB_MAX);
memset(arrays, 0, sizeof(*arrays) * NR_MAT_ATTRIBS);
/* Set up a constant (StrideB == 0) array for each current
@@ -137,11 +139,7 @@ static void init_mat_currval(GLcontext *ctx)
break;
}
if (i < MAT_ATTRIB_MAX)
cl->Ptr = (const void *)ctx->Light.Material.Attrib[i];
else
cl->Ptr = (const void *)ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i];
cl->Ptr = (const void *)ctx->Light.Material.Attrib[i];
cl->Type = GL_FLOAT;
cl->Stride = 0;
cl->StrideB = 0;