[PATCH 5/5] wined3d: Prefer the core glActiveTexture function.

[Wojciech Arabczyk]

On 5 January 2015 at 17:17, Matteo Bruni <mbruni at codeweavers.com> wrote:

> diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
> index 4da8c7d..023bcbf 100644
> --- a/dlls/wined3d/context.c
> +++ b/dlls/wined3d/context.c
> @@ -1328,8 +1328,8 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc
>
>      for (i = 0; i < count; ++i)
>      {
> -        GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i));
> -        checkGLcall("glActiveTextureARB");
> +        GL_EXTCALL(glActiveTexture(GL_TEXTURE0_ARB + i));
> +        checkGLcall("glActiveTexture");

Per analogy, shouldn't this be GL_TEXTURE0 instead?

>  {
> -    GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0 + unit));
> -    checkGLcall("glActiveTextureARB");
> +    GL_EXTCALL(glActiveTexture(GL_TEXTURE0 + unit));
> +    checkGLcall("glActiveTexture");
>      context->active_texture = unit;
>  }
>

-- 
With kind regards
Wojciech Arabczyk