hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-26 21:12:25 +00:00
Code Issues Projects Releases Wiki Activity

glamor: Use epoxy_gl_version() instead of rolling our own.

Browse source 
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Markus Wick 2014-03-18 09:42:50 +01:00 • committed by Eric Anholt
commit 15d36444ac
3 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
glamor/glamor.c
View file

@ -341,7 +341,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
else
glamor_priv->gl_flavor = GLAMOR_GL_ES2;
gl_version = glamor_gl_get_version();
gl_version = epoxy_gl_version();
/* We'd like to require GL_ARB_map_buffer_range or
* GL_OES_map_buffer_range, since it offers more information to
@ -357,12 +357,12 @@ glamor_init(ScreenPtr screen, unsigned int flags)
* Windows with Intel 4-series (G45) graphics or older.
*/
if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
if (gl_version < GLAMOR_GL_VERSION_ENCODE(1, 3)) {
if (gl_version < 13) {
ErrorF("Require OpenGL version 1.3 or later.\n");
goto fail;
}
} else {
if (gl_version < GLAMOR_GL_VERSION_ENCODE(2, 0)) {
if (gl_version < 20) {
ErrorF("Require Open GLES2.0 or later.\n");
goto fail;
}