devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=d7a8626f5b4927c30613ef6ad70589ebbae1553a

commit d7a8626f5b4927c30613ef6ad70589ebbae1553a
Author: Chris Michael <[email protected]>
Date:   Sun Mar 1 10:49:10 2015 -0500

    evas-gl-drm: Fix T2158: compile fails when --with-opengl=full is passed
    
    Summary: This fixes compile for the gl_drm engine if
    --with-opengl=full is passed on the cmd line. These changes are
    based on the diff provided by spotrh in the above ticket.
    
    @fix
    
    Signed-off-by: Chris Michael <[email protected]>
---
 src/modules/evas/engines/gl_drm/evas_drm_main.c | 2 ++
 src/modules/evas/engines/gl_drm/evas_engine.h   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/modules/evas/engines/gl_drm/evas_drm_main.c 
b/src/modules/evas/engines/gl_drm/evas_drm_main.c
index d0fe125..9918673 100644
--- a/src/modules/evas/engines/gl_drm/evas_drm_main.c
+++ b/src/modules/evas/engines/gl_drm/evas_drm_main.c
@@ -224,8 +224,10 @@ eng_window_new(Evas_Engine_Info_GL_Drm *info, Evas *e, 
struct gbm_device *gbm, s
         return NULL;
      }
 
+#ifdef GL_GLES
    gw->gl_context->egldisp = gw->egl_disp;
    gw->gl_context->eglctxt = gw->egl_context[0];
+#endif
 
    eng_window_use(gw);
    glsym_evas_gl_common_context_resize(gw->gl_context, w, h, rot);
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.h 
b/src/modules/evas/engines/gl_drm/evas_engine.h
index 47add69..9b436f8 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.h
+++ b/src/modules/evas/engines/gl_drm/evas_engine.h
@@ -10,6 +10,8 @@
 
 #define GL_GLEXT_PROTOTYPES
 #include <EGL/egl.h>
+#include <EGL/eglext.h>
+#include <EGL/eglmesaext.h>
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include "../gl_generic/Evas_Engine_GL_Generic.h"

-- 


Reply via email to