From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Wed, 24 Oct 2012 11:30:46 +0000 (+0100)
Subject: Handle visual creation errors.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=80734e8180656df3202d9ec58f7660cb508d5c1c;p=apitrace

Handle visual creation errors.
---

diff --git a/retrace/glretrace_ws.cpp b/retrace/glretrace_ws.cpp
index c49b472..de9fe08 100644
--- a/retrace/glretrace_ws.cpp
+++ b/retrace/glretrace_ws.cpp
@@ -52,6 +52,10 @@ getVisual(glws::Profile profile) {
     glws::Visual * & visual = visuals[profile];
     if (!visual) {
         visual = glws::createVisual(retrace::doubleBuffer, profile);
+        if (!visual) {
+            std::cerr << "error: failed to create OpenGL visual\n";
+            exit(1);
+        }
     }
     return visual;
 }
@@ -70,11 +74,11 @@ getDefaultProfile(void)
 
 static glws::Drawable *
 createDrawableHelper(glws::Profile profile, int width = 32, int height = 32, bool pbuffer = false) {
-    glws::Drawable *draw = glws::createDrawable(getVisual(profile), width, height, pbuffer);
+    glws::Visual *visual = getVisual(profile);
+    glws::Drawable *draw = glws::createDrawable(visual, width, height, pbuffer);
     if (!draw) {
         std::cerr << "error: failed to create OpenGL drawable\n";
         exit(1);
-        return NULL;
     }
 
     return draw;
@@ -101,8 +105,9 @@ createPbuffer(int width, int height) {
 
 Context *
 createContext(Context *shareContext, glws::Profile profile) {
+    glws::Visual *visual = getVisual(profile);
     glws::Context *shareWsContext = shareContext ? shareContext->wsContext : NULL;
-    glws::Context *ctx = glws::createContext(getVisual(profile), shareWsContext, profile, retrace::debug);
+    glws::Context *ctx = glws::createContext(visual, shareWsContext, profile, retrace::debug);
     if (!ctx) {
         std::cerr << "error: failed to create OpenGL context\n";
         exit(1);