Re: [PATCH 2/5] wined3d: Make use of WGL_WINE_make_current extension to restore the previous GL context without reference to its DC.

[Henri Verbeet]

On 23 February 2014 23:58, Ken Thomases <ken(a)codeweavers.com> wrote:
> +    if (gl_info->supported[WGL_WINE_MAKE_CURRENT] &&
> +        !(gl_info->p_wglMakeContextCurrentWINE = (void *)wglGetProcAddress("wglMakeContextCurrentWINE")))
> +        gl_info->supported[WGL_WINE_MAKE_CURRENT] = FALSE;
> Why can't load_gl_funcs() take care of this?
> {"WGL_WINE_pixel_format_passthrough",   WGL_WINE_PIXEL_FORMAT_PASSTHROUGH},
> +    {"WGL_WINE_make_current",               WGL_WINE_MAKE_CURRENT},

...
> WGL_WINE_PIXEL_FORMAT_PASSTHROUGH,
> +    WGL_WINE_MAKE_CURRENT,

With the (obvious) exceptions of WINED3D_GL_EXT_NONE and
WINED3D_GL_EXT_COUNT, the wined3d_gl_extension enum is supposed to be
in lexicographical order.

[PATCH 2/5] wined3d: Make use of WGL_WINE_make_current extension to restore the previous GL context without reference to its DC.

[Ken Thomases]

On Feb 24, 2014, at 4:53 AM, Henri Verbeet wrote:
> On 23 February 2014 23:58, Ken Thomases <ken(a)codeweavers.com> wrote:
> > +    if (gl_info->supported[WGL_WINE_MAKE_CURRENT] &&
> > +        !(gl_info->p_wglMakeContextCurrentWINE = (void *)wglGetProcAddress("wglMakeContextCurrentWINE")))
> > +        gl_info->supported[WGL_WINE_MAKE_CURRENT] = FALSE;
> > Why can't load_gl_funcs() take care of this?

The WGL extensions haven't been parsed by the time load_gl_funcs() is called.  Also, it seemed at least somewhat similar to the other code right above it.
> > {"WGL_WINE_pixel_format_passthrough",   WGL_WINE_PIXEL_FORMAT_PASSTHROUGH},
> > +    {"WGL_WINE_make_current",               WGL_WINE_MAKE_CURRENT},
>
> ...
> > WGL_WINE_PIXEL_FORMAT_PASSTHROUGH,
> > +    WGL_WINE_MAKE_CURRENT,
>
> With the (obvious) exceptions of WINED3D_GL_EXT_NONE and
> WINED3D_GL_EXT_COUNT, the wined3d_gl_extension enum is supposed to be
> in lexicographical order.

OK.

-Ken

[PATCH 2/5] wined3d: Make use of WGL_WINE_make_current extension to restore the previous GL context without reference to its DC.

[Henri Verbeet]

On 24 February 2014 15:39, Ken Thomases <ken(a)codeweavers.com> wrote:
> On Feb 24, 2014, at 4:53 AM, Henri Verbeet wrote:
> > On 23 February 2014 23:58, Ken Thomases <ken(a)codeweavers.com> wrote:
> > > +    if (gl_info->supported[WGL_WINE_MAKE_CURRENT] &&
> > > +        !(gl_info->p_wglMakeContextCurrentWINE = (void *)wglGetProcAddress("wglMakeContextCurrentWINE")))
> > > +        gl_info->supported[WGL_WINE_MAKE_CURRENT] = FALSE;
> > > Why can't load_gl_funcs() take care of this?
>
> The WGL extensions haven't been parsed by the time load_gl_funcs() is called.

Yes, but load_gl_funcs() doesn't depend on that.