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/mipmap.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/mipmap.c')
| -rw-r--r-- | src/mesa/main/mipmap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c index 5046995..7fd6fbf 100644 --- a/src/mesa/main/mipmap.c +++ b/src/mesa/main/mipmap.c @@ -1715,12 +1715,12 @@ _mesa_generate_mipmap_level(GLenum target, dstWidth, dstData[0]); break; case GL_TEXTURE_2D: - case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB: - case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB: - case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB: + case GL_TEXTURE_CUBE_MAP_POSITIVE_X: + case GL_TEXTURE_CUBE_MAP_NEGATIVE_X: + case GL_TEXTURE_CUBE_MAP_POSITIVE_Y: + case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y: + case GL_TEXTURE_CUBE_MAP_POSITIVE_Z: + case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z: make_2d_mipmap(datatype, comps, border, srcWidth, srcHeight, srcData[0], srcRowStride, dstWidth, dstHeight, dstData[0], dstRowStride); @@ -2024,7 +2024,7 @@ generate_mipmap_compressed(struct gl_context *ctx, GLenum target, /* only two types of compressed textures at this time */ assert(texObj->Target == GL_TEXTURE_2D || texObj->Target == GL_TEXTURE_2D_ARRAY || - texObj->Target == GL_TEXTURE_CUBE_MAP_ARB || + texObj->Target == GL_TEXTURE_CUBE_MAP || texObj->Target == GL_TEXTURE_CUBE_MAP_ARRAY); /* |