<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Oct 11, 2016 at 7:26 PM, Tapani Pälli <span dir="ltr"><<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">it seems commit a40640f5303c9d03845459ecc364a3<wbr>466d25cb5b fixed this same issue (and some other failing tests) so this patch is no longer needed<span class=""><br>
<br></span></blockquote><div><br></div><div>Thanks! Sorry for the noise, then.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
<br>
On 10/11/2016 09:29 AM, Tomasz Figa wrote:<br>
</span><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
[Fixing CC list.]<br>
<br>
Ping. Would appreciate someone taking a look at this. Thanks in advance!<br>
<br>
On Fri, Aug 26, 2016 at 2:57 AM, Chad Versace <<a href="mailto:chadversary@chromium.org" target="_blank">chadversary@chromium.org</a><br></span><span class="">
<mailto:<a href="mailto:chadversary@chromium.org" target="_blank">chadversary@chromium.o<wbr>rg</a>>> wrote:<br>
<br>
Bump.<br>
<br>
On Thu 11 Aug 2016, Chad Versace wrote:<br>
> If check_textarget() determined that textarget was incorrect, it<br>
emitted<br>
> GL_INVALID_OPERATION. This is the correct behavior when target and<br>
> textarget are mismatched but textarget is a valid textarget enum.<br>
><br>
> When textarget is not a valid textarget enum, the GL spec requires<br>
that<br>
> GL_INVALID_ENUM be emitted.<br>
><br>
> Fixes test<br>
dEQP-GLES3.functional.negative<wbr>_api.buffer.framebuffer_<wbr>texture2d.<br>
><br>
> v2:<br>
> - Continue emitting GL_INVALID_OPERATION when textarget is<br>
> a valid textarget enum mismatched with target. [idr and imirkin]<br>
><br></span>
> Cc: Ian Romanick <<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a> <mailto:<a href="mailto:idr@freedesktop.org" target="_blank">idr@freedesktop.org</a>>><br>
> Cc: Ilia Mirkin <<a href="mailto:imirkin@alum.mit.edu" target="_blank">imirkin@alum.mit.edu</a> <mailto:<a href="mailto:imirkin@alum.mit.edu" target="_blank">imirkin@alum.mit.edu</a>>><br>
> Cc: Haixia Shi <<a href="mailto:hshi@chromium.org" target="_blank">hshi@chromium.org</a> <mailto:<a href="mailto:hshi@chromium.org" target="_blank">hshi@chromium.org</a>>><div><div class="h5"><br>
> Change-Id: I86c492f228720ec8cf9939e741cfc<wbr>99a5d9fa1bc<br>
> ---<br>
><br>
> I'm now checking that textarget is a valid textarget enum with a<br>
switch<br>
> at the top of the function, which emits error GL_INVALID_ENUM. The<br>
> switch lists every textarget I know of, but I'm not confident that<br>
it's<br>
> correct.<br>
><br>
> Should some textargets not be in the switch?<br>
><br>
><br>
><br>
> src/mesa/main/fbobject.c | 33 ++++++++++++++++++++++++++----<wbr>---<br>
> 1 file changed, 26 insertions(+), 7 deletions(-)<br>
><br>
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c<br>
> index 2c01526..76adb29 100644<br>
> --- a/src/mesa/main/fbobject.c<br>
> +++ b/src/mesa/main/fbobject.c<br>
> @@ -2979,6 +2979,32 @@ check_textarget(struct gl_context *ctx, int<br>
dims, GLenum target,<br>
> {<br>
> bool err = false;<br>
><br>
> + /* Check that textarget is a valid textarget enum. */<br>
> + switch (textarget) {<br>
> + case GL_TEXTURE_1D:<br>
> + case GL_TEXTURE_1D_ARRAY:<br>
> + case GL_TEXTURE_2D:<br>
> + case GL_TEXTURE_2D_ARRAY:<br>
> + case GL_TEXTURE_2D_MULTISAMPLE:<br>
> + case GL_TEXTURE_2D_MULTISAMPLE_ARRA<wbr>Y:<br>
> + case GL_TEXTURE_CUBE_MAP:<br>
> + case GL_TEXTURE_CUBE_MAP_ARRAY:<br>
> + case GL_TEXTURE_CUBE_MAP_POSITIVE_X<wbr>:<br>
> + case GL_TEXTURE_CUBE_MAP_NEGATIVE_X<wbr>:<br>
> + case GL_TEXTURE_CUBE_MAP_POSITIVE_Y<wbr>:<br>
> + case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y<wbr>:<br>
> + case GL_TEXTURE_CUBE_MAP_POSITIVE_Z<wbr>:<br>
> + case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z<wbr>:<br>
> + case GL_TEXTURE_RECTANGLE:<br>
> + case GL_TEXTURE_3D:<br>
> + break;<br>
> + default:<br>
> + _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid textarget<br>
%s)",<br>
> + caller, _mesa_enum_to_string(textarget<wbr>));<br>
> + return false;<br>
> + }<br>
> +<br>
> + /* Check that target and textarget match. */<br>
> switch (dims) {<br>
> case 1:<br>
> switch (textarget) {<br>
> @@ -3029,13 +3055,6 @@ check_textarget(struct gl_context *ctx, int<br>
dims, GLenum target,<br>
> err = true;<br>
> }<br>
><br>
> - if (err) {<br>
> - _mesa_error(ctx, GL_INVALID_OPERATION,<br>
> - "%s(invalid textarget %s)",<br>
> - caller, _mesa_enum_to_string(textarget<wbr>));<br>
> - return false;<br>
> - }<br>
> -<br>
> /* Make sure textarget is consistent with the texture's type */<br>
> err = (target == GL_TEXTURE_CUBE_MAP) ?<br>
> !_mesa_is_cube_face(textarget)<wbr>: (target != textarget);<br>
> --<br>
> 2.9.2<br>
><br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br></div></div>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a> <mailto:<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedes<wbr>ktop.org</a>><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
<<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org<wbr>/mailman/listinfo/mesa-dev</a>><span class=""><br>
<br>
<br>
<br>
<br>
______________________________<wbr>_________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
<br>
</span></blockquote>
</blockquote></div><br></div></div>