Hi, can someone take a look? It should be very straight forward. Eduardo
On 02/20/2015 02:09 PM, Eduardo Lima Mitev wrote: > This corrects a trivial error introduced in commit > 19252fee46b835cb4f6b1cce18d7737d62b64a2e. That patch was merged recently > and omits one condition (that 'samples' is greater than zero) in one of > the error checks. That error will definitely cause regressions. > --- > src/mesa/main/multisample.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c > index b696de9..50a8a11 100644 > --- a/src/mesa/main/multisample.c > +++ b/src/mesa/main/multisample.c > @@ -155,7 +155,8 @@ _mesa_check_sample_count(struct gl_context *ctx, GLenum > target, > * "If internalformat is a signed or unsigned integer format and > samples > * is greater than zero, then the error INVALID_OPERATION is > generated." > */ > - if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat)) { > + if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat) > + && samples > 0) { > return GL_INVALID_OPERATION; > } > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev