[Mesa-dev] [PATCH 1/5] mesa: remove _ARB suffix from cube map enums
Brian Paul
brianp at vmware.com
Fri Feb 12 15:09:28 UTC 2016
Ping. This is a pretty simple set of patches.
-Brian
On 02/11/2016 08:35 AM, Brian Paul wrote:
> Just minor clean-up so we're consistent everywhere.
> ---
> src/mesa/main/attrib.c | 4 ++--
> src/mesa/main/enable.c | 4 ++--
> src/mesa/main/genmipmap.c | 2 +-
> src/mesa/main/get.c | 2 +-
> src/mesa/main/mipmap.c | 14 +++++++-------
> src/mesa/main/texgetimage.c | 14 +++++++-------
> src/mesa/main/teximage.c | 34 +++++++++++++++++-----------------
> src/mesa/main/teximage.h | 4 ++--
> src/mesa/main/texobj.c | 26 +++++++++++++-------------
> src/mesa/main/texparam.c | 14 +++++++-------
> src/mesa/main/texstate.c | 2 +-
> 11 files changed, 60 insertions(+), 60 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;
> }
> diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
> index 3fd3c27..3985457 100644
> --- a/src/mesa/main/enable.c
> +++ b/src/mesa/main/enable.c
> @@ -749,7 +749,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
> return;
>
> /* GL_ARB_texture_cube_map */
> - case GL_TEXTURE_CUBE_MAP_ARB:
> + case GL_TEXTURE_CUBE_MAP:
> if (ctx->API != API_OPENGL_COMPAT && ctx->API != API_OPENGLES)
> goto invalid_enum_error;
> CHECK_EXTENSION(ARB_texture_cube_map, cap);
> @@ -1450,7 +1450,7 @@ _mesa_IsEnabled( GLenum cap )
> return ctx->Array.VAO->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled;
>
> /* GL_ARB_texture_cube_map */
> - case GL_TEXTURE_CUBE_MAP_ARB:
> + case GL_TEXTURE_CUBE_MAP:
> CHECK_EXTENSION(ARB_texture_cube_map);
> return is_texture_enabled(ctx, TEXTURE_CUBE_BIT);
>
> diff --git a/src/mesa/main/genmipmap.c b/src/mesa/main/genmipmap.c
> index 4ec8385..6c2d31d 100644
> --- a/src/mesa/main/genmipmap.c
> +++ b/src/mesa/main/genmipmap.c
> @@ -123,7 +123,7 @@ _mesa_generate_texture_mipmap(struct gl_context *ctx,
> GLuint face;
> for (face = 0; face < 6; face++) {
> ctx->Driver.GenerateMipmap(ctx,
> - GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB + face, texObj);
> + GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, texObj);
> }
> }
> else {
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index 9005dc5..f40c570 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -642,7 +642,7 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
> case GL_TEXTURE_1D:
> case GL_TEXTURE_2D:
> case GL_TEXTURE_3D:
> - case GL_TEXTURE_CUBE_MAP_ARB:
> + case GL_TEXTURE_CUBE_MAP:
> case GL_TEXTURE_RECTANGLE_NV:
> case GL_TEXTURE_EXTERNAL_OES:
> v->value_bool = _mesa_IsEnabled(d->pname);
> 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);
>
> /*
> diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
> index b273aaa..06bc8f1 100644
> --- a/src/mesa/main/texgetimage.c
> +++ b/src/mesa/main/texgetimage.c
> @@ -869,12 +869,12 @@ legal_getteximage_target(struct gl_context *ctx, GLenum target, bool dsa)
> * the targets from table 8.19 (for GetTexImage and GetnTexImage *only*),
> * or TEXTURE_CUBE_MAP (for GetTextureImage *only*)." (Emphasis added.)
> */
> - 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:
> return dsa ? GL_FALSE : ctx->Extensions.ARB_texture_cube_map;
> case GL_TEXTURE_CUBE_MAP:
> return dsa ? GL_TRUE : GL_FALSE;
> @@ -886,7 +886,7 @@ legal_getteximage_target(struct gl_context *ctx, GLenum target, bool dsa)
>
> /**
> * Wrapper for _mesa_select_tex_image() which can handle target being
> - * GL_TEXTURE_CUBE_MAP_ARB in which case we use zoffset to select a cube face.
> + * GL_TEXTURE_CUBE_MAP in which case we use zoffset to select a cube face.
> * This can happen for glGetTextureImage and glGetTextureSubImage (DSA
> * functions).
> */
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 50141be..68a9752 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -273,15 +273,15 @@ proxy_target(GLenum target)
> case GL_TEXTURE_3D:
> case GL_PROXY_TEXTURE_3D:
> return GL_PROXY_TEXTURE_3D;
> - 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_ARB:
> - case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
> - return GL_PROXY_TEXTURE_CUBE_MAP_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:
> + case GL_TEXTURE_CUBE_MAP:
> + case GL_PROXY_TEXTURE_CUBE_MAP:
> + return GL_PROXY_TEXTURE_CUBE_MAP;
> case GL_TEXTURE_RECTANGLE_NV:
> case GL_PROXY_TEXTURE_RECTANGLE_NV:
> return GL_PROXY_TEXTURE_RECTANGLE_NV;
> @@ -472,13 +472,13 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target)
> case GL_PROXY_TEXTURE_3D:
> return ctx->Const.Max3DTextureLevels;
> case GL_TEXTURE_CUBE_MAP:
> - 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_PROXY_TEXTURE_CUBE_MAP_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:
> + case GL_PROXY_TEXTURE_CUBE_MAP:
> return ctx->Extensions.ARB_texture_cube_map
> ? ctx->Const.MaxCubeTextureLevels : 0;
> case GL_TEXTURE_RECTANGLE_NV:
> @@ -1016,7 +1016,7 @@ _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target,
> case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
> case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
> case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
> - case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
> + case GL_PROXY_TEXTURE_CUBE_MAP:
> maxSize = 1 << (ctx->Const.MaxCubeTextureLevels - 1);
> maxSize >>= level;
> if (width != height)
> diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
> index 5df36c5..fe5b485 100644
> --- a/src/mesa/main/teximage.h
> +++ b/src/mesa/main/teximage.h
> @@ -43,8 +43,8 @@ extern "C" {
> static inline GLboolean
> _mesa_is_cube_face(GLenum target)
> {
> - return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
> - target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB);
> + return (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
> + target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z);
> }
>
> /** Are any of the dimensions of given texture equal to zero? */
> diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
> index e926c7b..c63d443 100644
> --- a/src/mesa/main/texobj.c
> +++ b/src/mesa/main/texobj.c
> @@ -171,16 +171,16 @@ _mesa_get_current_tex_object(struct gl_context *ctx, GLenum target)
> return texUnit->CurrentTex[TEXTURE_3D_INDEX];
> case GL_PROXY_TEXTURE_3D:
> return ctx->Texture.ProxyTex[TEXTURE_3D_INDEX];
> - 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_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:
> + case GL_TEXTURE_CUBE_MAP:
> return ctx->Extensions.ARB_texture_cube_map
> ? texUnit->CurrentTex[TEXTURE_CUBE_INDEX] : NULL;
> - case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
> + case GL_PROXY_TEXTURE_CUBE_MAP:
> return ctx->Extensions.ARB_texture_cube_map
> ? ctx->Texture.ProxyTex[TEXTURE_CUBE_INDEX] : NULL;
> case GL_TEXTURE_CUBE_MAP_ARRAY:
> @@ -239,7 +239,7 @@ _mesa_get_current_tex_object(struct gl_context *ctx, GLenum target)
> * \param shared the shared GL state structure to contain the texture object
> * \param name integer name for the texture object
> * \param target either GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_3D,
> - * GL_TEXTURE_CUBE_MAP_ARB or GL_TEXTURE_RECTANGLE_NV. zero is ok for the sake
> + * GL_TEXTURE_CUBE_MAP or GL_TEXTURE_RECTANGLE_NV. zero is ok for the sake
> * of GenTextures()
> *
> * \return pointer to new texture object.
> @@ -270,7 +270,7 @@ _mesa_initialize_texture_object( struct gl_context *ctx,
> target == GL_TEXTURE_1D ||
> target == GL_TEXTURE_2D ||
> target == GL_TEXTURE_3D ||
> - target == GL_TEXTURE_CUBE_MAP_ARB ||
> + target == GL_TEXTURE_CUBE_MAP ||
> target == GL_TEXTURE_RECTANGLE_NV ||
> target == GL_TEXTURE_1D_ARRAY_EXT ||
> target == GL_TEXTURE_2D_ARRAY_EXT ||
> @@ -513,7 +513,7 @@ valid_texture_object(const struct gl_texture_object *tex)
> case GL_TEXTURE_1D:
> case GL_TEXTURE_2D:
> case GL_TEXTURE_3D:
> - case GL_TEXTURE_CUBE_MAP_ARB:
> + case GL_TEXTURE_CUBE_MAP:
> case GL_TEXTURE_RECTANGLE_NV:
> case GL_TEXTURE_1D_ARRAY_EXT:
> case GL_TEXTURE_2D_ARRAY_EXT:
> @@ -725,7 +725,7 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
> case GL_TEXTURE_3D:
> maxLevels = ctx->Const.Max3DTextureLevels;
> break;
> - case GL_TEXTURE_CUBE_MAP_ARB:
> + case GL_TEXTURE_CUBE_MAP:
> case GL_TEXTURE_CUBE_MAP_ARRAY:
> maxLevels = ctx->Const.MaxCubeTextureLevels;
> break;
> @@ -768,7 +768,7 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
> return;
> }
>
> - if (t->Target == GL_TEXTURE_CUBE_MAP_ARB) {
> + if (t->Target == GL_TEXTURE_CUBE_MAP) {
> /* Make sure that all six cube map level 0 images are the same size and
> * format.
> * Note: we know that the image's width==height (we enforce that
> diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
> index 89f286c..00cea3e 100644
> --- a/src/mesa/main/texparam.c
> +++ b/src/mesa/main/texparam.c
> @@ -1215,12 +1215,12 @@ legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target,
> return GL_TRUE;
> case GL_TEXTURE_2D_ARRAY_EXT:
> return ctx->Extensions.EXT_texture_array;
> - 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:
> return ctx->Extensions.ARB_texture_cube_map;
> case GL_TEXTURE_2D_MULTISAMPLE:
> case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
> @@ -1237,7 +1237,7 @@ legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target,
> case GL_PROXY_TEXTURE_2D:
> case GL_PROXY_TEXTURE_3D:
> return GL_TRUE;
> - case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
> + case GL_PROXY_TEXTURE_CUBE_MAP:
> return ctx->Extensions.ARB_texture_cube_map;
> case GL_TEXTURE_CUBE_MAP_ARRAY_ARB:
> case GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB:
> diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
> index 9d88554..9ee5c69 100644
> --- a/src/mesa/main/texstate.c
> +++ b/src/mesa/main/texstate.c
> @@ -786,7 +786,7 @@ alloc_proxy_textures( struct gl_context *ctx )
> GL_TEXTURE_2D_ARRAY_EXT,
> GL_TEXTURE_1D_ARRAY_EXT,
> GL_TEXTURE_EXTERNAL_OES,
> - GL_TEXTURE_CUBE_MAP_ARB,
> + GL_TEXTURE_CUBE_MAP,
> GL_TEXTURE_3D,
> GL_TEXTURE_RECTANGLE_NV,
> GL_TEXTURE_2D,
>
More information about the mesa-dev
mailing list