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

2013-04-22 Thread Stefan Dösinger
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Am 2013-04-22 14:54, schrieb Henri Verbeet: > On 22 April 2013 14:48, Stefan Dösinger > wrote: >> Personally I don't like ifs without braces if either the >> condition or the instruction is spread over more than one line. >> > Well, I do disagree, bu

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

2013-04-22 Thread Henri Verbeet
On 22 April 2013 14:48, Stefan Dösinger wrote: > Personally I don't like ifs without braces if either the condition or > the instruction is spread over more than one line. > Well, I do disagree, but note that that reasoning doesn't actually apply here, both are single-line.

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

2013-04-22 Thread 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 wrote: >> -if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) >> -sample_flags |= WINED3D_GLSL_SAMPLE_RECT; +if >> (priv->cur_ps_args->np2_f

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

2013-04-22 Thread Henri Verbeet
On 21 April 2013 16:51, Stefan Dösinger 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; > +