Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4774338b authored by Jesse Hall's avatar Jesse Hall
Browse files

Add ES3 support to libGLESv2 and tracing tools 

Since ES3 is backwards compatible with ES2, a new wrapper isn't
necessary, and the Khronos implementation guidelines recommend
supporting both versions with the same library.

Change-Id: If9bb02be60ce01cc5fe25d1f40c4e7f37244ebf6
parent 61d1b812

opengl/libs/EGL/egl.cpp

+12 −14
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 


#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <GLES/gl.h>

#include <GLES/glext.h>



#include <cutils/log.h>

#include <cutils/atomic.h>

opengl/libs/EGL/eglApi.cpp

+17 −19
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 


#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <GLES/gl.h>

#include <GLES/glext.h>



#include <cutils/log.h>

#include <cutils/atomic.h>
@@ -457,7 +455,7 @@ EGLContext eglCreateContext(EGLDisplay dpy, EGLConfig config, 
                    if (attr == EGL_CONTEXT_CLIENT_VERSION) {

                        if (value == 1) {

                            version = egl_connection_t::GLESv1_INDEX;

                        } else if (value == 2) {

                        } else if (value == 2 || value == 3) {

                            version = egl_connection_t::GLESv2_INDEX;

                        }

                    }

opengl/libs/EGL/egl_display.h

+9 −11
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <GLES/gl.h>

#include <GLES/glext.h>



#include <cutils/compiler.h>

#include <utils/SortedVector.h>

opengl/libs/EGL/egl_object.cpp

+9 −11
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <GLES/gl.h>

#include <GLES/glext.h>



#include <utils/threads.h>

opengl/libs/EGL/egl_object.h

+9 −11
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 


#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <GLES/gl.h>

#include <GLES/glext.h>



#include <utils/threads.h>

#include <utils/String8.h>