Properly check for EGL_KHR_create_context before creating ES3 context.

samples/sample_util/SampleApplication.cpp

@@ -7,14 +7,16 @@
 #include "SampleApplication.h"
 #include "EGLWindow.h"
 
-SampleApplication::SampleApplication(const std::string& name, size_t width, size_t height,
-                                     EGLint glesMajorVersion, EGLint requestedRenderer)
-    : mName(name),
-      mWidth(width),
-      mHeight(height),
-      mRunning(false)
+SampleApplication::SampleApplication(const std::string &name,
+                                     size_t width,
+                                     size_t height,
+                                     EGLint glesMajorVersion,
+                                     EGLint glesMinorVersion,
+                                     EGLint requestedRenderer)
+    : mName(name), mWidth(width), mHeight(height), mRunning(false)
 {
-    mEGLWindow.reset(new EGLWindow(glesMajorVersion, EGLPlatformParameters(requestedRenderer)));
+    mEGLWindow.reset(new EGLWindow(glesMajorVersion, glesMinorVersion,
+                                   EGLPlatformParameters(requestedRenderer)));
     mTimer.reset(CreateTimer());
     mOSWindow.reset(CreateOSWindow());
 

samples/sample_util/SampleApplication.h

@@ -23,8 +23,12 @@ class EGLWindow;
 class SampleApplication
 {
   public:
-    SampleApplication(const std::string& name, size_t width, size_t height,
-                      EGLint glesMajorVersion = 2, EGLint requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE);
+    SampleApplication(const std::string &name,
+                      size_t width,
+                      size_t height,
+                      EGLint glesMajorVersion  = 2,
+                      EGLint glesMinorVersion  = 0,
+                      EGLint requestedRenderer = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE);
     virtual ~SampleApplication();
 
     virtual bool initialize();

src/libANGLE/renderer/gl/cgl/DisplayCGL.mm

@@ -119,7 +119,7 @@ const FunctionsGL *DisplayCGL::getFunctionsGL() const
 
 void DisplayCGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
 {
-    UNIMPLEMENTED();
+    outExtensions->createContext = true;
 }
 
 void DisplayCGL::generateCaps(egl::Caps *outCaps) const

src/libANGLE/renderer/gl/glx/DisplayGLX.cpp

@@ -452,7 +452,7 @@ const FunctionsGL *DisplayGLX::getFunctionsGL() const
 
 void DisplayGLX::generateExtensions(egl::DisplayExtensions *outExtensions) const
 {
-    // UNIMPLEMENTED();
+    outExtensions->createContext = true;
 }
 
 void DisplayGLX::generateCaps(egl::Caps *outCaps) const

src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp

@@ -466,7 +466,7 @@ const FunctionsGL *DisplayWGL::getFunctionsGL() const
 
 void DisplayWGL::generateExtensions(egl::DisplayExtensions *outExtensions) const
 {
-    //UNIMPLEMENTED();
+    outExtensions->createContext = true;
 }
 
 void DisplayWGL::generateCaps(egl::Caps *outCaps) const

src/tests/gl_tests/ProgramBinaryTest.cpp

@@ -201,7 +201,8 @@ class ProgramBinariesAcrossPlatforms : public testing::TestWithParam<PlatformsWi
 
     EGLWindow *createAndInitEGLWindow(angle::PlatformParameters &param)
     {
-        EGLWindow *eglWindow = new EGLWindow(param.majorVersion, param.eglParameters);
+        EGLWindow *eglWindow =
+            new EGLWindow(param.majorVersion, param.minorVersion, param.eglParameters);
         bool result = eglWindow->initializeGL(mOSWindow);
         if (result == false)
         {

src/tests/perf_tests/ANGLEPerfTest.cpp

@@ -105,7 +105,8 @@ ANGLERenderTest::~ANGLERenderTest()
 void ANGLERenderTest::SetUp()
 {
     mOSWindow = CreateOSWindow();
-    mEGLWindow = new EGLWindow(mTestParams.majorVersion, mTestParams.eglParameters);
+    mEGLWindow = new EGLWindow(mTestParams.majorVersion, mTestParams.minorVersion,
+                               mTestParams.eglParameters);
     mEGLWindow->setSwapInterval(0);
 
     if (!mOSWindow->initialize(mName, mTestParams.windowWidth, mTestParams.windowHeight))

src/tests/test_utils/ANGLETest.cpp

@@ -7,7 +7,8 @@ ANGLETest::ANGLETest()
       mWidth(0),
       mHeight(0)
 {
-    mEGLWindow = new EGLWindow(GetParam().majorVersion, GetParam().eglParameters);
+    mEGLWindow =
+        new EGLWindow(GetParam().majorVersion, GetParam().minorVersion, GetParam().eglParameters);
 }
 
 ANGLETest::~ANGLETest()
@@ -201,7 +202,7 @@ void ANGLETest::setMultisampleEnabled(bool enabled)
 
 int ANGLETest::getClientVersion() const
 {
-    return mEGLWindow->getClientVersion();
+    return mEGLWindow->getClientMajorVersion();
 }
 
 EGLWindow *ANGLETest::getEGLWindow() const

src/tests/test_utils/angle_test_instantiate.cpp

@@ -63,7 +63,8 @@ bool IsPlatformAvailable(const PlatformParameters &param)
 
         if (result)
         {
-            EGLWindow *eglWindow = new EGLWindow(param.majorVersion, param.eglParameters);
+            EGLWindow *eglWindow =
+                new EGLWindow(param.majorVersion, param.minorVersion, param.eglParameters);
             result = eglWindow->initializeGL(osWindow);
 
             eglWindow->destroyGL();

util/EGLWindow.cpp

@@ -69,11 +69,14 @@ bool operator==(const EGLPlatformParameters &a, const EGLPlatformParameters &b)
            (a.deviceType == b.deviceType);
 }
 
-EGLWindow::EGLWindow(EGLint glesMajorVersion, const EGLPlatformParameters &platform)
+EGLWindow::EGLWindow(EGLint glesMajorVersion,
+                     EGLint glesMinorVersion,
+                     const EGLPlatformParameters &platform)
     : mDisplay(EGL_NO_DISPLAY),
       mSurface(EGL_NO_SURFACE),
       mContext(EGL_NO_CONTEXT),
-      mClientVersion(glesMajorVersion),
+      mClientMajorVersion(glesMajorVersion),
+      mClientMinorVersion(glesMinorVersion),
       mPlatform(platform),
       mRedBits(-1),
       mGreenBits(-1),
@@ -153,6 +156,16 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
         return false;
     }
 
+    const char *displayExtensions = eglQueryString(mDisplay, EGL_EXTENSIONS);
+
+    // EGL_KHR_create_context is required to request a non-ES2 context.
+    bool hasKHRCreateContext = strstr(displayExtensions, "EGL_KHR_create_context") != nullptr;
+    if (majorVersion != 2 && minorVersion != 0 && !hasKHRCreateContext)
+    {
+        destroyGL();
+        return false;
+    }
+
     eglBindAPI(EGL_OPENGL_ES_API);
     if (eglGetError() != EGL_SUCCESS)
     {
@@ -187,7 +200,7 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
     eglGetConfigAttrib(mDisplay, mConfig, EGL_STENCIL_SIZE, &mStencilBits);
 
     std::vector<EGLint> surfaceAttributes;
-    if (strstr(eglQueryString(mDisplay, EGL_EXTENSIONS), "EGL_NV_post_sub_buffer") != nullptr)
+    if (strstr(displayExtensions, "EGL_NV_post_sub_buffer") != nullptr)
     {
         surfaceAttributes.push_back(EGL_POST_SUB_BUFFER_SUPPORTED_NV);
         surfaceAttributes.push_back(EGL_TRUE);
@@ -203,13 +216,18 @@ bool EGLWindow::initializeGL(OSWindow *osWindow)
     }
     ASSERT(mSurface != EGL_NO_SURFACE);
 
-    EGLint contextAttibutes[] =
+    std::vector<EGLint> contextAttributes;
+    if (hasKHRCreateContext)
     {
-        EGL_CONTEXT_CLIENT_VERSION, mClientVersion,
-        EGL_NONE
-    };
+        contextAttributes.push_back(EGL_CONTEXT_MAJOR_VERSION_KHR);
+        contextAttributes.push_back(mClientMajorVersion);
+
+        contextAttributes.push_back(EGL_CONTEXT_MINOR_VERSION_KHR);
+        contextAttributes.push_back(mClientMinorVersion);
+    }
+    contextAttributes.push_back(EGL_NONE);
 
-    mContext = eglCreateContext(mDisplay, mConfig, NULL, contextAttibutes);
+    mContext = eglCreateContext(mDisplay, mConfig, nullptr, &contextAttributes[0]);
     if (eglGetError() != EGL_SUCCESS)
     {
         destroyGL();

util/EGLWindow.h

@@ -50,11 +50,12 @@ bool operator==(const EGLPlatformParameters &a, const EGLPlatformParameters &b);
 class EGLWindow : angle::NonCopyable
 {
   public:
-    EGLWindow(EGLint glesMajorVersion, const EGLPlatformParameters &platform);
+    EGLWindow(EGLint glesMajorVersion,
+              EGLint glesMinorVersion,
+              const EGLPlatformParameters &platform);
 
     ~EGLWindow();
 
-    void setClientVersion(EGLint glesMajorVersion) { mClientVersion = glesMajorVersion; }
     void setConfigRedBits(int bits) { mRedBits = bits; }
     void setConfigGreenBits(int bits) { mGreenBits = bits; }
     void setConfigBlueBits(int bits) { mBlueBits = bits; }
@@ -68,7 +69,8 @@ class EGLWindow : angle::NonCopyable
 
     void swap();
 
-    EGLint getClientVersion() const { return mClientVersion; }
+    EGLint getClientMajorVersion() const { return mClientMajorVersion; }
+    EGLint getClientMinorVersion() const { return mClientMinorVersion; }
     const EGLPlatformParameters &getPlatform() const { return mPlatform; }
     EGLConfig getConfig() const;
     EGLDisplay getDisplay() const;
@@ -93,7 +95,8 @@ class EGLWindow : angle::NonCopyable
     EGLSurface mSurface;
     EGLContext mContext;
 
-    EGLint mClientVersion;
+    EGLint mClientMajorVersion;
+    EGLint mClientMinorVersion;
     EGLPlatformParameters mPlatform;
     int mRedBits;
     int mGreenBits;