<div dir="ltr"><div>Yeah, I think you're right about that. I'll send out a quick fix-up patch. I guess we don't have piglit tests for that either.<br></div>--Jason<br><div><div><div class="gmail_extra"><br><br>
<div class="gmail_quote">On Wed, Aug 13, 2014 at 10:56 AM, Roland Scheidegger <span dir="ltr"><<a href="mailto:sroland@vmware.com" target="_blank">sroland@vmware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Oh and forgot to mention, on a quick looked it seemed to me like the<br>
texstore_swizzle path could potentially forget about transfer ops, or<br>
can't this happen? Of course at least the state tracker would not be<br>
affected by this (as it implements the transfer ops on its own).<br>
<br>
Roland<br>
<br>
Am 13.08.2014 19:46, schrieb Roland Scheidegger:<br>
<div><div class="h5">> Ha one minute faster :-).<br>
> FWIW interestingly this one also fixes the other conform failures I was<br>
> seeing (with GL_BYTE/GL_RGB data) when unconditionally disabling<br>
> texstore_swizzle so I guess the results of the swizzle path aren't quite<br>
> identical to the fallback one, which is a bit worrying.<br>
><br>
> Roland<br>
><br>
><br>
> Am 13.08.2014 19:35, schrieb Jason Ekstrand:<br>
>> Roland,<br>
>> I just sent the exact same patch.<br>
>><br>
>> Reviewed-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a><br>
>> <mailto:<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>>><br>
>><br>
>><br>
>> On Wed, Aug 13, 2014 at 10:33 AM, <<a href="mailto:sroland@vmware.com">sroland@vmware.com</a><br>
>> <mailto:<a href="mailto:sroland@vmware.com">sroland@vmware.com</a>>> wrote:<br>
>><br>
>> From: Roland Scheidegger <<a href="mailto:sroland@vmware.com">sroland@vmware.com</a><br>
>> <mailto:<a href="mailto:sroland@vmware.com">sroland@vmware.com</a>>><br>
>><br>
>> This got broken by 3dbf5bf6571e0c9d3e4febce01dea82be190d9d2.<br>
>> GL_COLOR_INDEX data is still supported (in legacy contexts), but the new<br>
>> texstore_swizzle path cannot handle it (and didn't detect this).<br>
>> Unfortunately there's no piglit test trying to specify textures with a<br>
>> GL_COLOR_INDEX source format, and I don't really understand how all<br>
>> the color<br>
>> map stuff which is used by this works, but this caused conform failures<br>
>> (with a reported mesa implementation error when trying to figure out<br>
>> the color<br>
>> mapping).<br>
>> ---<br>
>> src/mesa/main/texstore.c | 3 +++<br>
>> 1 file changed, 3 insertions(+)<br>
>><br>
>> diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c<br>
>> index 50306d8..4ea5bd8 100644<br>
>> --- a/src/mesa/main/texstore.c<br>
>> +++ b/src/mesa/main/texstore.c<br>
>> @@ -1495,6 +1495,9 @@ texstore_swizzle(TEXSTORE_PARAMS)<br>
>> if (!is_array)<br>
>> return GL_FALSE;<br>
>><br>
>> + if (srcFormat == GL_COLOR_INDEX)<br>
>> + return GL_FALSE;<br>
>> +<br>
>> switch (srcType) {<br>
>> case GL_FLOAT:<br>
>> case GL_UNSIGNED_BYTE:<br>
>> --<br>
>> 1.9.1<br>
>> _______________________________________________<br>
>> mesa-dev mailing list<br>
>> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <mailto:<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a>><br>
</div></div>>> <a href="https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/mesa-dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=F4msKE2WxRzA%2BwN%2B25muztFm5TSPwE8HKJfWfR2NgfY%3D%0A&m=xqryYn1SYeTuaMHcKhK9kr5ky%2B5J1xT0UbAWnqrV6NI%3D%0A&s=ebe6df4c3e57be9157eb91233e4e044c21707ee4994d7c87a4c027db8d4f83e2" target="_blank">https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/mesa-dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=F4msKE2WxRzA%2BwN%2B25muztFm5TSPwE8HKJfWfR2NgfY%3D%0A&m=xqryYn1SYeTuaMHcKhK9kr5ky%2B5J1xT0UbAWnqrV6NI%3D%0A&s=ebe6df4c3e57be9157eb91233e4e044c21707ee4994d7c87a4c027db8d4f83e2</a><br>
>> <<a href="https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/mesa-dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=F4msKE2WxRzA%2BwN%2B25muztFm5TSPwE8HKJfWfR2NgfY%3D%0A&m=kpN1ocKMKopthTMpVD729xdP3L%2F%2BKfivsbBUJlBpVdY%3D%0A&s=079b1ceec81b05c2373f584c1766e6c24fe8895f13610993060e66d56dc2a1de" target="_blank">https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/mesa-dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=F4msKE2WxRzA%2BwN%2B25muztFm5TSPwE8HKJfWfR2NgfY%3D%0A&m=kpN1ocKMKopthTMpVD729xdP3L%2F%2BKfivsbBUJlBpVdY%3D%0A&s=079b1ceec81b05c2373f584c1766e6c24fe8895f13610993060e66d56dc2a1de</a>><br>
<div class="">>><br>
>><br>
><br>
> _______________________________________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
</div>> <a href="https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/mesa-dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=F4msKE2WxRzA%2BwN%2B25muztFm5TSPwE8HKJfWfR2NgfY%3D%0A&m=xqryYn1SYeTuaMHcKhK9kr5ky%2B5J1xT0UbAWnqrV6NI%3D%0A&s=ebe6df4c3e57be9157eb91233e4e044c21707ee4994d7c87a4c027db8d4f83e2" target="_blank">https://urldefense.proofpoint.com/v1/url?u=http://lists.freedesktop.org/mailman/listinfo/mesa-dev&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=F4msKE2WxRzA%2BwN%2B25muztFm5TSPwE8HKJfWfR2NgfY%3D%0A&m=xqryYn1SYeTuaMHcKhK9kr5ky%2B5J1xT0UbAWnqrV6NI%3D%0A&s=ebe6df4c3e57be9157eb91233e4e044c21707ee4994d7c87a4c027db8d4f83e2</a><br>
><br>
<br>
</blockquote></div><br></div></div></div></div>