diff options
| author | Dave Airlie <[email protected]> | 2012-11-07 12:51:35 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-11-09 10:26:37 +1000 |
| commit | 5b115864d2d6b9a1235dfe510e89ed1a5f6ed3a3 (patch) | |
| tree | 74348bd700fdc4fe7e5e66153a9b1189e950d541 | |
| parent | 4c8750015b23207de0b44f39bd33bb556268b51d (diff) | |
mesa: arb_texture_cube_map_array: fix attrib push/pop
fdo9833 piglit test caught this.
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/mesa/main/attrib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 05db35b8e10..49a3ab5b43d 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -684,7 +684,6 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) _mesa_set_enable(ctx, GL_TEXTURE_2D_ARRAY_EXT, !!(unit->Enabled & TEXTURE_2D_ARRAY_BIT)); } - _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->EnvMode); _mesa_TexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, unit->EnvColor); _mesa_TexGeni(GL_S, GL_TEXTURE_GEN_MODE, unit->GenS.Mode); @@ -762,7 +761,10 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) !ctx->Extensions.MESA_texture_array) { continue; } - else if (obj->Target == GL_TEXTURE_BUFFER) + else if (obj->Target == GL_TEXTURE_CUBE_MAP_ARRAY && + !ctx->Extensions.ARB_texture_cube_map_array) { + continue; + } else if (obj->Target == GL_TEXTURE_BUFFER) continue; else if (obj->Target == GL_TEXTURE_EXTERNAL_OES) continue; |