diff options
| author | Brian Paul <brianp@vmware.com> | 2016-02-11 07:45:50 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2016-02-12 15:10:15 -0700 |
| commit | 6a08673c5eb4d55522888c3c2fd6af6946ce1264 (patch) | |
| tree | c98fc156bb6cb0aa1c029631ce3880d74267e26e /src/mesa/main/attrib.c | |
| parent | ae70d0d68c06c3624fef345f70f9576b29a243bd (diff) | |
| download | external_mesa3d-6a08673c5eb4d55522888c3c2fd6af6946ce1264.zip external_mesa3d-6a08673c5eb4d55522888c3c2fd6af6946ce1264.tar.gz external_mesa3d-6a08673c5eb4d55522888c3c2fd6af6946ce1264.tar.bz2 | |
mesa: remove _ARB suffix from cube map enums
Just minor clean-up so we're consistent everywhere.
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Diffstat (limited to 'src/mesa/main/attrib.c')
| -rw-r--r-- | src/mesa/main/attrib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 08f1317..61f7036 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -766,7 +766,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) _mesa_set_enable(ctx, GL_TEXTURE_2D, !!(unit->Enabled & TEXTURE_2D_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_3D, !!(unit->Enabled & TEXTURE_3D_BIT)); if (ctx->Extensions.ARB_texture_cube_map) { - _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP_ARB, + _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, !!(unit->Enabled & TEXTURE_CUBE_BIT)); } if (ctx->Extensions.NV_texture_rectangle) { @@ -837,7 +837,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) /* don't restore state for unsupported targets to prevent * raising GL errors. */ - if (obj->Target == GL_TEXTURE_CUBE_MAP_ARB && + if (obj->Target == GL_TEXTURE_CUBE_MAP && !ctx->Extensions.ARB_texture_cube_map) { continue; } |