diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2021-12-14 16:43:32 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-12-15 20:25:19 +0000 |
| commit | c11641ab2419f961bbaea0d4e1c806a4fea5f819 (patch) | |
| tree | cd10374fecf5ff978fe38233187aeb69be996da4 /src/mesa/main/samplerobj.c | |
| parent | 2ca13abccebfaafe567f78ad40a04d1129e63942 (diff) | |
mesa: OpenGL 1.3 feature GL_ARB_texture_border_clamp is not optional
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14203>
Diffstat (limited to 'src/mesa/main/samplerobj.c')
| -rw-r--r-- | src/mesa/main/samplerobj.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c index d59d920d3ea..26fbc49edec 100644 --- a/src/mesa/main/samplerobj.c +++ b/src/mesa/main/samplerobj.c @@ -505,9 +505,8 @@ validate_texture_wrap_mode(struct gl_context *ctx, GLenum wrap) case GL_CLAMP_TO_EDGE: case GL_REPEAT: case GL_MIRRORED_REPEAT: - return GL_TRUE; case GL_CLAMP_TO_BORDER: - return e->ARB_texture_border_clamp; + return GL_TRUE; case GL_MIRROR_CLAMP_EXT: return e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp; case GL_MIRROR_CLAMP_TO_EDGE_EXT: @@ -1549,8 +1548,6 @@ _mesa_GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint *params) *params = lroundf(sampObj->Attrib.MaxAnisotropy); break; case GL_TEXTURE_BORDER_COLOR: - if (!ctx->Extensions.ARB_texture_border_clamp) - goto invalid_pname; params[0] = FLOAT_TO_INT(sampObj->Attrib.state.border_color.f[0]); params[1] = FLOAT_TO_INT(sampObj->Attrib.state.border_color.f[1]); params[2] = FLOAT_TO_INT(sampObj->Attrib.state.border_color.f[2]); |