Re: [WINED3D 13/13] Further split GLSL & ARB_v/f_program generation and allow GLSL functions to be called.

[H. Verbeet]

On 10/05/06, Jason Green <jave27(a)gmail.com> wrote:
> This patch splits the remaining ARB_vertex_program calls out of of the
> generate_base_shader function and adds the option to call GLSL
> routines instead.  These new routines are disabled because USING_GLSL
> is defined as 0 in wined3d_private.h at the moment.  It should remain
> 0 until everything is implemented, working well, and tested
> thoroughly.
> I think it would be best not to have USING_GLSL checks at several
> different places in the code. The function signatures are the same, so
> it wouldn't be that hard to just pass a pointer to the correct
> function.

[WINED3D 13/13] Further split GLSL & ARB_v/f_program generation and allow GLSL functions to be called.

[Jason Green]

On 5/10/06, H. Verbeet <hverbeet(a)gmail.com> wrote:
> I think it would be best not to have USING_GLSL checks at several
> different places in the code. The function signatures are the same, so
> it wouldn't be that hard to just pass a pointer to the correct
> function.

True, it could be combined better in that function.  I'll be on
vacation for about a week, but I'll further clean that up when I get
back.

FYI - I placed the USING_GLSL define in wined3d_private.h because it
will also be needed in other placed in wined3d as well.  At a minimum,
we will also need it in drawprim.c - drawPrimitiveDrawStrided() where
it sets the constants.  I have a patch that does that currently, but
it's too ugly to submit yet.

[WINED3D 13/13] Further split GLSL & ARB_v/f_program generation and allow GLSL functions to be called.

[H. Verbeet]

On 10/05/06, Jason Green <jave27(a)gmail.com> wrote:
> On 5/10/06, H. Verbeet <hverbeet(a)gmail.com> wrote:
> > I think it would be best not to have USING_GLSL checks at several
> > different places in the code. The function signatures are the same, so
> > it wouldn't be that hard to just pass a pointer to the correct
> > function.
>
> True, it could be combined better in that function.  I'll be on
> vacation for about a week, but I'll further clean that up when I get
> back.
>
> FYI - I placed the USING_GLSL define in wined3d_private.h because it
> will also be needed in other placed in wined3d as well.  At a minimum,
> we will also need it in drawprim.c - drawPrimitiveDrawStrided() where
> it sets the constants.  I have a patch that does that currently, but
> it's too ugly to submit yet.
> Yes, although eventually it should become a variable rather than a constant.