Refactor window creation into egl module

1 files changed, 30 insertions, 17 deletions

diff --git a/src/egl.cpp b/src/egl.cpp
index 978a334..e3ae179 100644
--- a/src/egl.cpp
+++ b/src/egl.cpp
@@ -7,6 +7,25 @@
 #include "egl.h"
 
 bool
+createWindow(egl_state_t *state, int width, int height)
+{
+  state->dpy = XOpenDisplay (NULL);
+  if (state->dpy == NULL) {
+    warnx ("Failed to open display: %s\n", XDisplayName (0));
+    return false;
+  }
+
+  state->window = XCreateSimpleWindow (state->dpy, DefaultRootWindow (state->dpy),
+                                       0, 0,
+                                       width, height,
+                                       0,
+                                       BlackPixel (state->dpy, DefaultRootWindow (state->dpy)),
+                                       BlackPixel (state->dpy, DefaultRootWindow (state->dpy)));
+  XMapWindow (state->dpy, state->window);
+  return true;
+}
+
+bool
 createEGLContextWithWindow(egl_state_t *state)
 {
   EGLint attr[] = {
@@ -27,6 +46,7 @@ createEGLContextWithWindow(egl_state_t *state)
   };
   EGLConfig config;
   EGLint num;
+  EGLint major, minor;
 
   state->egl_display = eglGetDisplay ((EGLNativeDisplayType) state->dpy);
   if (state->egl_display == EGL_NO_DISPLAY) {
@@ -34,6 +54,16 @@ createEGLContextWithWindow(egl_state_t *state)
     return false;
   }
 
+  if (!eglInitialize(state->egl_display, &major, &minor)) {
+    warnx ("Cannot initialize EGL\n");
+    return false;
+  }
+
+  if (!eglBindAPI(EGL_OPENGL_ES_API)) {
+    warnx ("Cannot bind EGL to GLES API\n");
+    return false;
+  }
+
   if (! eglChooseConfig (state->egl_display, attr, &config, 1, &num)) {
     warnx ("Cannot choose EGL configuration\n");
     return false;
@@ -52,20 +82,3 @@ createEGLContextWithWindow(egl_state_t *state)
   }
   return true;
 }
-
-bool
-initializeEGL(egl_state_t *state)
-{
-  EGLint major, minor;
-  if (!eglInitialize(state->egl_display, &major, &minor)) {
-    warnx ("Cannot initialize EGL\n");
-    return false;
-  }
-
-  if (!eglBindAPI(EGL_OPENGL_ES_API)) {
-    warnx ("Cannot bind EGL to GLES API\n");
-    return false;
-  }
-
-  return true;
-}