fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: GL_TEXTURE_BORDER_COLOR exists in OpenGL 1.0, so don't depend on GL_ARB_texture_border_clamp

Browse source 
On NV20 (and probably also on earlier NV GPUs that lack
GL_ARB_texture_border_clamp) fixes the following piglit tests:

    gl-1.0-beginend-coverage gltexparameter[if]{v,}
    push-pop-texture-state
    texwrap 1d
    texwrap 1d proj
    texwrap 2d proj
    texwrap formats

All told, 49 more tests pass on NV20 (10de:0201).

No changes on Intel CI run or RV250 (1002:4c66).

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Ian Romanick 2017-06-07 01:35:08 -07:00
parent 36bd4a5f21
commit 2e3f40272e
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/main/texparam.c
View file

@ -736,8 +736,16 @@ set_tex_parameterf(struct gl_context *ctx,
break;
case GL_TEXTURE_BORDER_COLOR:
/* Border color exists in desktop OpenGL since 1.0 for GL_CLAMP. In
* OpenGL ES 2.0+, it only exists in when GL_OES_texture_border_clamp is
* enabled. It is never available in OpenGL ES 1.x.
*
* FIXME: Every driver that supports GLES2 has this extension. Elide
* the check?
*/
if (ctx->API == API_OPENGLES ||
!ctx->Extensions.ARB_texture_border_clamp)
(ctx->API == API_OPENGLES2 &&
!ctx->Extensions.ARB_texture_border_clamp))
goto invalid_pname;
if (!_mesa_target_allows_setting_sampler_parameters(texObj->Target))