From e5fac610c843159a4f4b0da7e4a2c074783ac1ed Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sat, 28 Nov 2015 16:23:18 +0100
Subject: [PATCH] Remove unnecessary HAVE_EGL setting in dtool_config.h

---
 makepanda/makepanda.py                   | 1 -
 panda/metalibs/pandagles/pandagles.cxx   | 8 +++-----
 panda/metalibs/pandagles2/pandagles2.cxx | 9 ---------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
index 78050c5967..a4a749f695 100755
--- a/makepanda/makepanda.py
+++ b/makepanda/makepanda.py
@@ -2097,7 +2097,6 @@ DTOOL_CONFIG=[
     ("USE_DELETED_CHAIN",              '1',                      '1'),
     ("HAVE_WIN_TOUCHINPUT",            'UNDEF',                  'UNDEF'),
     ("HAVE_GLX",                       'UNDEF',                  '1'),
-    ("HAVE_EGL",                       'UNDEF',                  'UNDEF'),
     ("HAVE_WGL",                       '1',                      'UNDEF'),
     ("HAVE_DX9",                       'UNDEF',                  'UNDEF'),
     ("HAVE_CHROMIUM",                  'UNDEF',                  'UNDEF'),
diff --git a/panda/metalibs/pandagles/pandagles.cxx b/panda/metalibs/pandagles/pandagles.cxx
index ff9ea8c43e..5b3b2926f0 100644
--- a/panda/metalibs/pandagles/pandagles.cxx
+++ b/panda/metalibs/pandagles/pandagles.cxx
@@ -11,7 +11,7 @@
 #if defined(ANDROID)
 #include "config_androiddisplay.h"
 #include "androidGraphicsPipe.h"
-#elif defined(HAVE_EGL)
+#else
 #include "config_egldisplay.h"
 #include "eglGraphicsPipe.h"
 #endif
@@ -36,7 +36,7 @@ init_libpandagles() {
 
 #if defined(ANDROID)
   init_libandroiddisplay();
-#elif defined(HAVE_EGL)
+#else
   init_libegldisplay();
 #endif
 }
@@ -50,9 +50,7 @@ int
 get_pipe_type_pandagles() {
 #if defined(ANDROID)
   return AndroidGraphicsPipe::get_class_type().get_index();
-#elif defined(HAVE_EGL)
+#else
   return eglGraphicsPipe::get_class_type().get_index();
 #endif
-
-  return 0;
 }
diff --git a/panda/metalibs/pandagles2/pandagles2.cxx b/panda/metalibs/pandagles2/pandagles2.cxx
index ff890ecd8e..5404617da0 100644
--- a/panda/metalibs/pandagles2/pandagles2.cxx
+++ b/panda/metalibs/pandagles2/pandagles2.cxx
@@ -8,10 +8,8 @@
 #define OPENGLES_2
 #include "config_gles2gsg.h"
 
-#ifdef HAVE_EGL
 #include "config_egldisplay.h"
 #include "eglGraphicsPipe.h"
-#endif
 
 // By including checkPandaVersion.h, we guarantee that runtime
 // attempts to load libpandagles2.so/.dll will fail if they inadvertently
@@ -30,10 +28,7 @@
 void
 init_libpandagles2() {
   init_libgles2gsg();
-
-#ifdef HAVE_EGL
   init_libegldisplay();
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -43,9 +38,5 @@ init_libpandagles2() {
 ////////////////////////////////////////////////////////////////////
 int
 get_pipe_type_pandagles2() {
-#ifdef HAVE_EGL
   return eglGraphicsPipe::get_class_type().get_index();
-#endif
-
-  return 0;
 }