KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: revert fast-track glColor and similar calls when not immediate mode rendering 

Revert commit d08cd68d3f

This change caused some glean tests to fail.  The alpha value of colors was
always 1.0 instead of the value from glColor4fv().  The mesa color array
found in st_draw() has size=3 instead of size=4.
This commit is contained in:
Brian 2008-03-14 10:20:29 -06:00
parent ee55eaa609
commit c45a525cdc
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mesa/vbo/vbo_exec_api.c
View File

@ -309,23 +309,16 @@ static void vbo_exec_fixup_vertex( GLcontext *ctx,
GLuint attr, GLuint sz )
{
struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
static const GLfloat id[4] = { 0, 0, 0, 1 };
int i;
if (exec->vtx.prim_count == 0) {
GLfloat *current = (GLfloat *)vbo_context(ctx)->currval[attr].Ptr;
exec->vtx.attrptr[attr] = current;
memcpy(current, id, sizeof(id));
ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;
return;
}
else if (sz > exec->vtx.attrsz[attr]) {
if (sz > exec->vtx.attrsz[attr]) {
/* New size is larger. Need to flush existing vertices and get
* an enlarged vertex format.
*/
vbo_exec_wrap_upgrade_vertex( exec, attr, sz );
}
else if (sz < exec->vtx.active_sz[attr]) {
static const GLfloat id[4] = { 0, 0, 0, 1 };
/* New size is smaller - just need to fill in some
* zeros. Don't need to flush or wrap.