Advertise EGL configs as ES1 renderable.

BUG=18110152

Change-Id: Ie69340a202f1e62eb453b8aad7952711325b2cc4
Reviewed-on: https://swiftshader-review.googlesource.com/1240
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/GLES2/common/debug.cpp b/src/GLES2/common/debug.cpp
index 4ccb313..7381129 100644 (file)
--- a/src/GLES2/common/debug.cpp
+++ b/src/GLES2/common/debug.cpp
@@ -20,7 +20,8 @@ namespace gl
 {\r
        static void output(const char *format, va_list vararg)\r
        {\r
-               #if 0\r
+               if(false)\r
+               {\r
                        FILE* file = fopen(TRACE_OUTPUT_FILE, "a");\r
 \r
                        if(file)\r
@@ -28,7 +29,7 @@ namespace gl
                                vfprintf(file, format, vararg);\r
                                fclose(file);\r
                        }\r
-               #endif\r
+               }\r
        }\r
 \r
        void trace(const char *format, ...)\r

diff --git a/src/GLES2/libEGL/Config.cpp b/src/GLES2/libEGL/Config.cpp
index 8e6dd36..ea80e42 100644 (file)
--- a/src/GLES2/libEGL/Config.cpp
+++ b/src/GLES2/libEGL/Config.cpp
@@ -84,7 +84,7 @@ void Config::set(DisplayMode displayMode, EGLint minInterval, EGLint maxInterval
     mColorBufferType = EGL_RGB_BUFFER;
     mConfigCaveat = (displayMode.format == renderTargetFormat) ? EGL_NONE : EGL_SLOW_CONFIG;
     mConfigID = 0;
-    mConformant = EGL_OPENGL_ES2_BIT;
+    mConformant = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT;
 
        switch (depthStencilFormat)
        {
@@ -142,7 +142,7 @@ void Config::set(DisplayMode displayMode, EGLint minInterval, EGLint maxInterval
     mNativeRenderable = EGL_FALSE;
     mNativeVisualID = 0;
     mNativeVisualType = 0;
-    mRenderableType = EGL_OPENGL_ES2_BIT;
+    mRenderableType = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT;
     mSampleBuffers = multiSample ? 1 : 0;
     mSamples = multiSample;
     mSurfaceType = EGL_PBUFFER_BIT | EGL_WINDOW_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT;