Fix context creation problems in dm

tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "gl/GLTestContext.h"
 
 #include <X11/Xlib.h>
@@ skipping 166 matching lines @@
         }
     } else {
         //SkDebugf("Creating context.\n");
         PFNGLXCREATECONTEXTATTRIBSARBPROC glXCreateContextAttribsARB =
             (PFNGLXCREATECONTEXTATTRIBSARBPROC) glXGetProcAddressARB((GrGLubyte*)"glXCreateContextAttribsARB");
 
         if (kGLES_GrGLStandard == forcedGpuAPI) {
             if (gluCheckExtension(
                     reinterpret_cast<const GLubyte*>("GLX_EXT_create_context_es2_profile"),
                     reinterpret_cast<const GLubyte*>(glxExts))) {
-                static const int context_attribs_gles[] = {
-                    GLX_CONTEXT_MAJOR_VERSION_ARB, 3,
+                const int context_attribs_gles[] = {
+                    GLX_CONTEXT_MAJOR_VERSION_ARB, 2,
                     GLX_CONTEXT_MINOR_VERSION_ARB, 0,
                     GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_ES2_PROFILE_BIT_EXT,
                     None
                 };
                 fContext = glXCreateContextAttribsARB(fDisplay, bestFbc, glxShareContext, True,
                                                       context_attribs_gles);
             }
         } else {
             // Well, unfortunately GLX will not just give us the highest context so instead we have
             // to do this nastiness
             for (i = NUM_GL_VERSIONS - 2; i > 0 ; i--) {
                 /* don't bother below GL 3.0 */
-                if (gl_versions[i].major == 3 && gl_versions[i].minor == 0) {
+                if (gl_versions[i].major < 3) {
                     break;
                 }
                 // On Nvidia GPUs, to use Nv Path rendering we need a compatibility profile for the
                 // time being.
                 // TODO when Nvidia implements NVPR on Core profiles, we should start requesting
                 // core here
-                static const int context_attribs_gl[] = {
+                // Warning: This array should not be set to static. The
+                // glXCreateContextAttribsARB call writes to it upon failure and
+                // the next call would fail too.
+                const int context_attribs_gl[] = {
                       GLX_CONTEXT_MAJOR_VERSION_ARB, gl_versions[i].major,
                       GLX_CONTEXT_MINOR_VERSION_ARB, gl_versions[i].minor,
                       GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
                       None
                 };
                 fContext =
                         glXCreateContextAttribsARB(fDisplay, bestFbc, glxShareContext, True,
                                                    context_attribs_gl);
 
                 // Sync to ensure any errors generated are processed.
                 XSync(fDisplay, False);
 
                 if (!ctxErrorOccurred && fContext) {
                     break;
                 }
                 // try again
                 ctxErrorOccurred = false;
             }
 
             // Couldn't create GL 3.0 context.
             // Fall back to old-style 2.x context.
             // When a context version below 3.0 is requested,
             // implementations will return the newest context version
             // compatible with OpenGL versions less than version 3.0.
             if (ctxErrorOccurred || !fContext) {
-                static const int context_attribs_gl_fallback[] = {
+                const int context_attribs_gl_fallback[] = {
                     GLX_CONTEXT_MAJOR_VERSION_ARB, 1,
                     GLX_CONTEXT_MINOR_VERSION_ARB, 0,
                     None
                 };
 
                 ctxErrorOccurred = false;
 
                 fContext = glXCreateContextAttribsARB(fDisplay, bestFbc, glxShareContext, True,
                                                       context_attribs_gl_fallback);
             }
@@ skipping 93 matching lines @@
                                            GLTestContext *shareContext) {
     GLXGLTestContext *glxShareContext = reinterpret_cast<GLXGLTestContext *>(shareContext);
     GLXGLTestContext *ctx = new GLXGLTestContext(forcedGpuAPI, glxShareContext);
     if (!ctx->isValid()) {
         delete ctx;
         return nullptr;
     }
     return ctx;
 }
 }  // namespace sk_gpu_test