[PATCH 1/2] wined3d: Remove leftover texture accesses in GLSL shader generation

[Stefan Dösinger]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 2013-04-22 14:42, schrieb Henri Verbeet:> On 21 April 2013 16:51,
Stefan Dösinger <stefan at codeweavers.com> wrote:
>> -    if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) 
>> -        sample_flags |= WINED3D_GLSL_SAMPLE_RECT; +    if
>> (priv->cur_ps_args->np2_fixup & (1 << sampler_idx)) +    { +
>> sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; +    }
> I don't think the added braces are an improvement, but otherwise
this looks ok.
Personally I don't like ifs without braces if either the condition or
the instruction is spread over more than one line.

Afaics the code isn't quite consistent in either direction. I can
resend the patch without the braces if you disagree.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRdTGfAAoJEN0/YqbEcdMwKIcP/ieIu1iHckCe1hSoG+Xx5YAm
4DBCjak4xlf1NfmVSik0RduCCG4mR1w2ZWkYXzrHuHUsQlh3ILsNe3nsHIOj/M4K
R82tmWfCS0iV5xThnGiIdVs4/7lkwcs8ZJGZDWhN8bvDZ3CtJCVSCepulPt1LJ8Q
+G2S18OKGIXgtQTYNPgvGK5V3QSpuSkAWkmfL45II9vD1/Qs4/SIEF/6jQrJ9cya
7DRnYhMRdZaz0zfrvjrq6rUQOWwtLPj50zDCINLS1w6prMZugyB9zdB5xmnAjzu2
eR9Dvh/7USzoFkbv2KwFwBQhxj5202+iUoDJEcKZ765GveeN5d3+GghLN8M1B8jR
9alSRqsirWvxiu/HT5W3e4Hm83TMp1XOrAgfrCQHjg9PGfQ/vWVjpf+uVh5xprzC
gRLW6ko5I9QKsFDuoeg5revedX2BP2z+iUH1zRIZhLnegdnEwVaIuuhPVZ4bW1WB
QqxfaMBuKJ8B86g8OEcE8BMHDF9qXCnd9ewS0qHpPwshvkBP3GJdJt1w5tVmvp/1
s/OTV4gBYIF6ZzWX89Boi0dWyUnUGFGl9n4FJbN3473SeJor0HkZHAgqXLbDgP/D
AbpmEgdiRhPTRGIfO42mwSqdOZjyXOvh5E2HoUlfxoM5xCqKkzrC2HqGHowUaxUy
FWJtBflkY/oslt8BQsLS
=qysk
-----END PGP SIGNATURE-----