diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-08-02 08:29:55 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-08-02 08:29:55 -0600 |
| commit | c3e6bfc9e27038172fff47f9cc5a8a53ff7038a3 (patch) | |
| tree | 5b8e86aff7fcbb89c2fa0314126b01fc39126224 /src/mesa/vbo/vbo_context.c | |
| parent | 46ac4531966e0edf802919def935c4125342e8bf (diff) | |
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.
Diffstat (limited to 'src/mesa/vbo/vbo_context.c')
| -rw-r--r-- | src/mesa/vbo/vbo_context.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index ad4556c500..656b27f28c 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -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; |