Use common display initialization logic for Unix

src/views/unix/SkOSWindow_Unix.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 <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/XKBlib.h>
 #include <GL/glx.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 
 #include "SkWindow.h"
 
+#include "gl/glx/GrNativeDisplay_glx.h"
+
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkEvent.h"
 #include "SkKey.h"
 #include "SkWindow.h"
 #include "XkeysToSkKeys.h"
 extern "C" {
     #include "keysym2ucs.h"
 }
@@ skipping 48 matching lines @@
             }
         }
         return;
     }
     fUnixWindow.fDisplay = XOpenDisplay(nullptr);
     Display* dsp = fUnixWindow.fDisplay;
     if (nullptr == dsp) {
         SkDebugf("Could not open an X Display");
         return;
     }
-    // Attempt to create a window that supports GL
-    GLint att[] = {
-        GLX_RGBA,
+

[robertphillips, 2015/10/16 14:54:40]

static const int attrs[] ?

+    int att[] = {
         GLX_DEPTH_SIZE, 24,
-        GLX_DOUBLEBUFFER,
+        GLX_DOUBLEBUFFER, true,

[robertphillips, 2015/10/16 14:54:40]

Don't we need these stencil settings in the other location too ?

         GLX_STENCIL_SIZE, 8,
         None
     };
-    SkASSERT(nullptr == fVi);
-    if (requestedMSAASampleCount > 0) {
-        static const GLint kAttCount = SK_ARRAY_COUNT(att);
-        GLint msaaAtt[kAttCount + 4];
-        memcpy(msaaAtt, att, sizeof(att));
-        SkASSERT(None == msaaAtt[kAttCount - 1]);
-        msaaAtt[kAttCount - 1] = GLX_SAMPLE_BUFFERS_ARB;
-        msaaAtt[kAttCount + 0] = 1;
-        msaaAtt[kAttCount + 1] = GLX_SAMPLES_ARB;
-        msaaAtt[kAttCount + 2] = requestedMSAASampleCount;
-        msaaAtt[kAttCount + 3] = None;
-        fVi = glXChooseVisual(dsp, DefaultScreen(dsp), msaaAtt);
-        fMSAASampleCount = requestedMSAASampleCount;
-    }
-    if (nullptr == fVi) {
-        fVi = glXChooseVisual(dsp, DefaultScreen(dsp), att);
-        fMSAASampleCount = 0;
-    }
 
-    if (fVi) {
+    GLXFBConfig bestFbConfig;
+    if (!GrNativeDisplay::Initialize(att, fUnixWindow.fDisplay, &bestFbConfig)) {
         if (info) {
-            glXGetConfig(dsp, fVi, GLX_SAMPLES_ARB, &info->fSampleCount);
+            info->fSampleCount = 0;
+            info->fStencilBits = 0;
+        }
+        // Create a simple window instead.  We will not be able to show GL
+        fUnixWindow.fWin = XCreateSimpleWindow(dsp,
+                                               DefaultRootWindow(dsp),
+                                               0, 0,  // x, y
+                                               WIDTH, HEIGHT,
+                                               0,     // border width
+                                               0,     // border value
+                                               0);    // background value
+    } else {
+        glXGetConfig(dsp, fVi, GLX_SAMPLES_ARB, &fMSAASampleCount);
+        if (fMSAASampleCount < requestedMSAASampleCount) {
+            SkDebugf("Requested samples exceeds the maximum allowed on this platform\n");
+        }
+
+        if (info) {

[robertphillips, 2015/10/16 14:54:40]

Shouldn't this be requestedMSAASampleCount ?

+            info->fSampleCount = fMSAASampleCount;
             glXGetConfig(dsp, fVi, GLX_STENCIL_SIZE, &info->fStencilBits);
         }
+
+        fVi = glXGetVisualFromFBConfig(fUnixWindow.fDisplay, bestFbConfig);
+        SkASSERT(fVi);
+
         Colormap colorMap = XCreateColormap(dsp,
                                             RootWindow(dsp, fVi->screen),
                                             fVi->visual,
-                                             AllocNone);
+                                            AllocNone);
         XSetWindowAttributes swa;
         swa.colormap = colorMap;
         swa.event_mask = EVENT_MASK;
         fUnixWindow.fWin = XCreateWindow(dsp,
                                          RootWindow(dsp, fVi->screen),
                                          0, 0, // x, y
                                          WIDTH, HEIGHT,
                                          0, // border width
                                          fVi->depth,
                                          InputOutput,
                                          fVi->visual,
                                          CWEventMask | CWColormap,
                                          &swa);
-    } else {
-        if (info) {
-            info->fSampleCount = 0;
-            info->fStencilBits = 0;
-        }
-        // Create a simple window instead.  We will not be able to show GL
-        fUnixWindow.fWin = XCreateSimpleWindow(dsp,
-                                               DefaultRootWindow(dsp),
-                                               0, 0,  // x, y
-                                               WIDTH, HEIGHT,
-                                               0,     // border width
-                                               0,     // border value
-                                               0);    // background value
+
     }
+
     this->mapWindowAndWait();
     fUnixWindow.fGc = XCreateGC(dsp, fUnixWindow.fWin, 0, nullptr);
 }
 
 static unsigned getModi(const XEvent& evt) {
     static const struct {
         unsigned    fXMask;
         unsigned    fSkMask;
     } gModi[] = {
         // X values found by experiment. Is there a better way?
@@ skipping 352 matching lines @@
 
 void SkEvent::SignalNonEmptyQueue() {
     // nothing to do, since we spin on our event-queue, polling for XPending
 }
 
 void SkEvent::SignalQueueTimer(SkMSec delay) {
     // just need to record the delay time. We handle waking up for it in
     // MyXNextEventWithDelay()
     gTimerDelay = delay;
 }