On Monday, November 7, 2016 11:49:13 AM PST Samuel Iglesias Gonsálvez wrote: > OpenGL ES 3.2 says in section 8.10. "TEXTURE PARAMETERS", at the end of > the section: > > "An INVALID_ENUM error is generated if target is TEXTURE_2D_- > MULTISAMPLE or TEXTURE_2D_MULTISAMPLE_ARRAY , and pname is any > sampler state from table 21.12." > > GL_TEXTURE_BORDER_COLOR is present in that table. > > Signed-off-by: Samuel Iglesias Gonsálvez <sigles...@igalia.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98250 > --- > src/mesa/main/texparam.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c > index 29eed07..ae96bd8 100644 > --- a/src/mesa/main/texparam.c > +++ b/src/mesa/main/texparam.c > @@ -974,6 +974,10 @@ _mesa_texture_parameterIiv(struct gl_context *ctx, > { > switch (pname) { > case GL_TEXTURE_BORDER_COLOR: > + if (!_mesa_target_allows_setting_sampler_parameters(texObj->Target)) { > + _mesa_error(ctx, GL_INVALID_ENUM, "glTextureParameterIiv(texture)"); > + return; > + } > FLUSH_VERTICES(ctx, _NEW_TEXTURE); > /* set the integer-valued border color */ > COPY_4V(texObj->Sampler.BorderColor.i, params); > @@ -992,6 +996,10 @@ _mesa_texture_parameterIuiv(struct gl_context *ctx, > { > switch (pname) { > case GL_TEXTURE_BORDER_COLOR: > + if (!_mesa_target_allows_setting_sampler_parameters(texObj->Target)) { > + _mesa_error(ctx, GL_INVALID_ENUM, > "glTextureParameterIuiv(texture)"); > + return; > + } > FLUSH_VERTICES(ctx, _NEW_TEXTURE); > /* set the unsigned integer-valued border color */ > COPY_4V(texObj->Sampler.BorderColor.ui, params); >
You need to add this check in _mesa_texture_parameteriv as well. - glTexParameterfv: already checks this (confirms we need this) :) - glTexParameterIiv: fixed by your patch - glTexParameterIuiv: fixed by your patch - glTexParameteriv: needs the error check also. With that fixed, this is: Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
