| Index: app/gfx/gl/gl_context_linux.cc
|
| ===================================================================
|
| --- app/gfx/gl/gl_context_linux.cc (revision 48331)
|
| +++ app/gfx/gl/gl_context_linux.cc (working copy)
|
| @@ -9,11 +9,13 @@
|
| #include <GL/glxew.h>
|
| #include <GL/glx.h>
|
| #include <GL/osmew.h>
|
| +#include <unistd.h>
|
| #include <X11/Xlib.h>
|
| #include <X11/Xutil.h>
|
|
|
| #include "app/x11_util.h"
|
| #include "base/logging.h"
|
| +#include "base/process_util.h"
|
| #include "base/scoped_ptr.h"
|
| #include "app/gfx/gl/gl_context.h"
|
| #include "app/gfx/gl/gl_context_osmesa.h"
|
| @@ -149,6 +151,16 @@
|
| LOG(ERROR) << "glxewContextInit failed";
|
| return false;
|
| }
|
| +
|
| + int major, minor;
|
| + if (!glXQueryVersion(display, &major, &minor)) {
|
| + LOG(ERROR) << "glxQueryVersion failed";
|
| + return false;
|
| + }
|
| +
|
| + if (major == 1 && minor < 3) {
|
| + LOG(WARNING) << "GLX 1.3 or later is recommended.";
|
| + }
|
| }
|
|
|
| initialized = true;
|
|
|