From 937d3bcecf04305c01159f5c5084833f28014061 Mon Sep 17 00:00:00 2001 From: Zhigang Gong Date: Thu, 22 Sep 2011 13:39:01 +0800 Subject: [PATCH] glamor: Correct the version check for GLES2. If we are using GLES2, then the version number should be no less than 2.0 rather than no less than 1.3 which is for GL API. --- glamor/glamor.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index ea4099ed2..a35fbee52 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -295,10 +295,17 @@ glamor_init(ScreenPtr screen, unsigned int flags) gl_version = glamor_gl_get_version(); +#ifndef GLAMOR_GLES2 if (gl_version < GLAMOR_GL_VERSION_ENCODE(1,3)) { - ErrorF("Require Opengl 1.3 or latter.\n"); + 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 glamor_gl_dispatch_init(screen, &glamor_priv->dispatch, gl_version);