[PATCH 04/15] glamor: Drop a bunch of GLES2 ifdefs.

[Rémi Cardona]

Le lundi 03 février 2014 à 11:03 -0800, Eric Anholt a écrit :
>  
> -#ifndef GLAMOR_GLES2
> -    if (gl_version < GLAMOR_GL_VERSION_ENCODE(1, 3)) {
> -        ErrorF("Require OpenGL version 1.3 or latter.\n");
> -        goto fail;
> -    }
> -#else
> -    if (gl_version < GLAMOR_GL_VERSION_ENCODE(2, 0)) {
> -        ErrorF("Require Open GLES2.0 or latter.\n");
> -        goto fail;
> -    }
> -#endif
> +    if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
> +        if (gl_version < GLAMOR_GL_VERSION_ENCODE(1, 3)) {
> +            ErrorF("Require OpenGL version 1.3 or latter.\n");
> +            goto fail;
> +        }
> +    } else {
> +        if (gl_version < GLAMOR_GL_VERSION_ENCODE(2, 0)) {
> +            ErrorF("Require Open GLES2.0 or latter.\n");
> +            goto fail;
> +        }

If your shuffling this around then: s/latter/later/

Cheers,

Rémi