Browse Source

secondary color fixes.

tags/mesa_20060325
Aapo Tahkola 19 years ago
parent
commit
af8d39861d
1 changed files with 15 additions and 1 deletions
  1. 15
    1
      src/mesa/drivers/dri/r300/r300_maos.c

+ 15
- 1
src/mesa/drivers/dri/r300/r300_maos.c View File

} }


if (inputs & _TNL_BIT_COLOR1) { if (inputs & _TNL_BIT_COLOR1) {
CONFIGURE_AOS(i_color[1], AOS_FORMAT_FLOAT_COLOR,
int emitsize=4;

if (!immd) {
if (VB->AttribPtr[VERT_ATTRIB_COLOR1].size == 4 &&
(VB->AttribPtr[VERT_ATTRIB_COLOR1].stride != 0 ||
((float*)VB->AttribPtr[VERT_ATTRIB_COLOR1].data)[3] != 1.0)) {
emitsize = 4;
} else {
emitsize = 3;
}//emitsize = VB->AttribPtr[VERT_ATTRIB_COLOR1].size;
}
if(VB->AttribPtr[VERT_ATTRIB_COLOR1].type == GL_UNSIGNED_BYTE)
emitsize = 1;

CONFIGURE_AOS(i_color[1], VB->AttribPtr[VERT_ATTRIB_COLOR1].type == GL_UNSIGNED_BYTE ? AOS_FORMAT_UBYTE : AOS_FORMAT_FLOAT_COLOR,
VB->AttribPtr[VERT_ATTRIB_COLOR1], VB->AttribPtr[VERT_ATTRIB_COLOR1],
immd ? 4 : VB->AttribPtr[VERT_ATTRIB_COLOR1].size, immd ? 4 : VB->AttribPtr[VERT_ATTRIB_COLOR1].size,
count); count);

Loading…
Cancel
Save