Browse Source

mesa: fix texture border color code for glPopAttrib()

The texture object's border color used to be stored as GLchan but it's
been GLfloat for a while now.
tags/mesa_7_5
Brian Paul 16 years ago
parent
commit
9aca6769df
1 changed files with 1 additions and 7 deletions
  1. 1
    7
      src/mesa/main/attrib.c

+ 1
- 7
src/mesa/main/attrib.c View File

/* Restore texture object state for each target */ /* Restore texture object state for each target */
for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) { for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
const struct gl_texture_object *obj = NULL; const struct gl_texture_object *obj = NULL;
GLfloat bordColor[4];
GLenum target; GLenum target;


obj = &texstate->SavedObj[u][tgt]; obj = &texstate->SavedObj[u][tgt];


_mesa_BindTexture(target, obj->Name); _mesa_BindTexture(target, obj->Name);


bordColor[0] = CHAN_TO_FLOAT(obj->BorderColor[0]);
bordColor[1] = CHAN_TO_FLOAT(obj->BorderColor[1]);
bordColor[2] = CHAN_TO_FLOAT(obj->BorderColor[2]);
bordColor[3] = CHAN_TO_FLOAT(obj->BorderColor[3]);

_mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, bordColor);
_mesa_TexParameterfv(target, GL_TEXTURE_BORDER_COLOR, obj->BorderColor);
_mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority); _mesa_TexParameterf(target, GL_TEXTURE_PRIORITY, obj->Priority);
_mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS); _mesa_TexParameteri(target, GL_TEXTURE_WRAP_S, obj->WrapS);
_mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT); _mesa_TexParameteri(target, GL_TEXTURE_WRAP_T, obj->WrapT);

Loading…
Cancel
Save