[Cogl] [PATCH] Fix the WGL winsys to not use deprecated feature flags

[Robert Bragg]

This looks good to land to me:

Reviewed-by: Robert Bragg <robert at linux.intel.com>

thanks,
- Robert

On Tue, May 14, 2013 at 2:35 PM, Neil Roberts <neil at linux.intel.com> wrote:
> In b53e3c3c00e5bd the deprecated feature flags were removed and the
> winsys's were updated to stop using them. However the WGL winsys was
> missed so it would no longer compile.
> ---
>  cogl/winsys/cogl-winsys-wgl-feature-functions.h |  1 -
>  cogl/winsys/cogl-winsys-wgl.c                   | 12 +++++-------
>  2 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/cogl/winsys/cogl-winsys-wgl-feature-functions.h b/cogl/winsys/cogl-winsys-wgl-feature-functions.h
> index d22d9c3..4a7b8b8 100644
> --- a/cogl/winsys/cogl-winsys-wgl-feature-functions.h
> +++ b/cogl/winsys/cogl-winsys-wgl-feature-functions.h
> @@ -31,7 +31,6 @@ COGL_WINSYS_FEATURE_BEGIN (swap_control,
>                             "EXT\0",
>                             "swap_control\0",
>                             0,
> -                           0,
>                             COGL_WINSYS_FEATURE_SWAP_THROTTLE)
>  COGL_WINSYS_FEATURE_FUNCTION (int, wglSwapInterval,
>                                (int interval))
> diff --git a/cogl/winsys/cogl-winsys-wgl.c b/cogl/winsys/cogl-winsys-wgl.c
> index ce2e97c..df82a5d 100644
> --- a/cogl/winsys/cogl-winsys-wgl.c
> +++ b/cogl/winsys/cogl-winsys-wgl.c
> @@ -52,7 +52,7 @@ typedef struct _CoglRendererWgl
>    GModule *gl_module;
>
>    /* Function pointers for GLX specific extensions */
> -#define COGL_WINSYS_FEATURE_BEGIN(a, b, c, d, e, f)
> +#define COGL_WINSYS_FEATURE_BEGIN(a, b, c, d, e)
>
>  #define COGL_WINSYS_FEATURE_FUNCTION(ret, name, args) \
>    ret (APIENTRY * pf_ ## name) args;
> @@ -96,7 +96,7 @@ typedef struct _CoglOnscreenWgl
>  /* Define a set of arrays containing the functions required from GL
>     for each winsys feature */
>  #define COGL_WINSYS_FEATURE_BEGIN(name, namespaces, extension_names,    \
> -                                  feature_flags, feature_flags_private, \
> +                                  feature_flags_private,                \
>                                    winsys_feature)                       \
>    static const CoglFeatureFunction                                      \
>    cogl_wgl_feature_ ## name ## _funcs[] = {
> @@ -110,10 +110,10 @@ typedef struct _CoglOnscreenWgl
>  /* Define an array of features */
>  #undef COGL_WINSYS_FEATURE_BEGIN
>  #define COGL_WINSYS_FEATURE_BEGIN(name, namespaces, extension_names,    \
> -                                  feature_flags, feature_flags_private, \
> +                                  feature_flags_private,                \
>                                    winsys_feature)                       \
> -  { 255, 255, 0, namespaces, extension_names,                            \
> -      feature_flags, feature_flags_private,                             \
> +  { 255, 255, 0, namespaces, extension_names,                           \
> +      feature_flags_private,                                            \
>        winsys_feature,                                                   \
>        cogl_wgl_feature_ ## name ## _funcs },
>  #undef COGL_WINSYS_FEATURE_FUNCTION
> @@ -607,7 +607,6 @@ update_winsys_features (CoglContext *context, CoglError **error)
>
>    memset (context->winsys_features, 0, sizeof (context->winsys_features));
>
> -  context->feature_flags |= COGL_FEATURE_ONSCREEN_MULTIPLE;
>    COGL_FLAGS_SET (context->features,
>                    COGL_FEATURE_ID_ONSCREEN_MULTIPLE, TRUE);
>    COGL_FLAGS_SET (context->winsys_features,
> @@ -630,7 +629,6 @@ update_winsys_features (CoglContext *context, CoglError **error)
>                                   split_extensions,
>                                   wgl_renderer))
>            {
> -            context->feature_flags |= winsys_feature_data[i].feature_flags;
>              if (winsys_feature_data[i].winsys_feature)
>                COGL_FLAGS_SET (context->winsys_features,
>                                winsys_feature_data[i].winsys_feature,
> --
> 1.7.11.3.g3c3efa5
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl