commit 27dc68a3bc9f99da8e2a1b115a513496c9b99a8e
author Nicolas Capens <capn@google.com> Fri Oct 24 10:15:02 2014 -0400
committer Nicolas Capens <nicolascapens@google.com> Fri Oct 24 16:42:16 2014 +0000
tree 58bb66ae38a2c16fab5581373113978494b94680
parent 11157826d1a7ae76dce1788f57f0c50f3dcd71d8

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>

src/GLES2/common/debug.cpp

diff --git a/src/GLES2/common/debug.cpp b/src/GLES2/common/debug.cpp
index 4ccb313..7381129 100644
--- a/src/GLES2/common/debug.cpp
+++ b/src/GLES2/common/debug.cpp
@@ -20,7 +20,8 @@
 {

 	static void output(const char *format, va_list vararg)

 	{

-		#if 0

+		if(false)

+		{

 			FILE* file = fopen(TRACE_OUTPUT_FILE, "a");

 

 			if(file)

@@ -28,7 +29,7 @@
 				vfprintf(file, format, vararg);

 				fclose(file);

 			}

-		#endif

+		}

 	}

 

 	void trace(const char *format, ...)

src/GLES2/libEGL/Config.cpp

diff --git a/src/GLES2/libEGL/Config.cpp b/src/GLES2/libEGL/Config.cpp
index 8e6dd36..ea80e42 100644
--- a/src/GLES2/libEGL/Config.cpp
+++ b/src/GLES2/libEGL/Config.cpp
@@ -84,7 +84,7 @@
     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 @@
     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;