diff options
| author | Ian Romanick <[email protected]> | 2016-08-18 10:09:41 +0100 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2016-08-26 15:03:15 -0700 |
| commit | 66b988d09af1a505b428cf2a32c7ee11fb832982 (patch) | |
| tree | d9864ff7a491f67716dfeb65a4cb41096f8381fc /src/mesa/main | |
| parent | daf1a61e1147fcd5d6849920d4836bee7118c406 (diff) | |
mesa: Use _mesa_has_ARB_texture_cube_map_array instead of open-coding it
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/genmipmap.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/texobj.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/main/genmipmap.c b/src/mesa/main/genmipmap.c index 97d3c62b7bb..5038d5cc053 100644 --- a/src/mesa/main/genmipmap.c +++ b/src/mesa/main/genmipmap.c @@ -65,8 +65,7 @@ _mesa_is_valid_generate_texture_mipmap_target(struct gl_context *ctx, || !ctx->Extensions.EXT_texture_array; break; case GL_TEXTURE_CUBE_MAP_ARRAY: - error = _mesa_is_gles(ctx) || - !ctx->Extensions.ARB_texture_cube_map_array; + error = !_mesa_has_ARB_texture_cube_map_array(ctx); break; default: error = true; diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 97dfb0c59fd..e22bb5ff6a5 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1858,7 +1858,7 @@ tex_binding_to_index(const struct gl_context *ctx, GLenum binding) _mesa_has_OES_texture_buffer(ctx)) ? TEXTURE_BUFFER_INDEX : -1; case GL_TEXTURE_BINDING_CUBE_MAP_ARRAY: - return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_cube_map_array + return _mesa_has_ARB_texture_cube_map_array(ctx) ? TEXTURE_CUBE_ARRAY_INDEX : -1; case GL_TEXTURE_BINDING_2D_MULTISAMPLE: return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 722549d5da9..b48a980dc17 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1579,7 +1579,7 @@ _mesa_tex_target_to_index(const struct gl_context *ctx, GLenum target) return _mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external ? TEXTURE_EXTERNAL_INDEX : -1; case GL_TEXTURE_CUBE_MAP_ARRAY: - return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_cube_map_array + return _mesa_has_ARB_texture_cube_map_array(ctx) ? TEXTURE_CUBE_ARRAY_INDEX : -1; case GL_TEXTURE_2D_MULTISAMPLE: return ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_multisample) || |