sync with upstream

1 files changed, 20 insertions, 6 deletions

diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake
index 4333a69..fac21bc 100644
--- a/cmake/modules/FindOpenGLES.cmake
+++ b/cmake/modules/FindOpenGLES.cmake
@@ -10,14 +10,18 @@
 # OPENGLES_LIBRARIES - the OpenGLES libraries
 # OPENGLES_DEFINITIONS - the OpenGLES definitions
 
+if(CORE_PLATFORM_NAME_LC STREQUAL rbpi)
+    set(_brcmprefix brcm)
+endif()
+
 if(PKG_CONFIG_FOUND)
-  pkg_check_modules(PC_OPENGLES glesv2 QUIET)
+  pkg_check_modules(PC_OPENGLES ${_brcmprefix}glesv2 QUIET)
 endif()
 
 if(NOT CORE_SYSTEM_NAME STREQUAL ios)
   find_path(OPENGLES_INCLUDE_DIR GLES2/gl2.h
                                  PATHS ${PC_OPENGLES_INCLUDEDIR})
-  find_library(OPENGLES_gl_LIBRARY NAMES GLESv2
+  find_library(OPENGLES_gl_LIBRARY NAMES ${_brcmprefix}GLESv2
                                    PATHS ${PC_OPENGLES_LIBDIR})
 else()
   find_library(OPENGLES_gl_LIBRARY NAMES OpenGLES
@@ -27,14 +31,24 @@ else()
   set(OPENGLES_INCLUDE_DIR ${OPENGLES_gl_LIBRARY}/Headers)
 endif()
 
+find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h)
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OpenGLES
                                   REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_INCLUDE_DIR)
 
+find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h
+                                PATHS ${PC_OPENGLES_INCLUDEDIR})
+
 if(OPENGLES_FOUND)
-  set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
   set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY})
-  set(OPENGLES_DEFINITIONS -DHAVE_LIBGLESV2)
+  if(OPENGLES3_INCLUDE_DIR)
+    set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR} ${OPENGLES3_INCLUDE_DIR})
+    set(OPENGLES_DEFINITIONS -DHAS_GLES=3)
+    mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES3_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+  else()
+    set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
+    set(OPENGLES_DEFINITIONS -DHAS_GLES=2)
+    mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+  endif()
 endif()
-
-mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)