Commit 27dc68a3 by Nicolas Capens Committed by Nicolas Capens

Advertise EGL configs as ES1 renderable.

BUG=18110152 Change-Id: Ie69340a202f1e62eb453b8aad7952711325b2cc4 Reviewed-on: https://swiftshader-review.googlesource.com/1240Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 11157826
...@@ -20,7 +20,8 @@ namespace gl ...@@ -20,7 +20,8 @@ namespace gl
{ {
static void output(const char *format, va_list vararg) static void output(const char *format, va_list vararg)
{ {
#if 0 if(false)
{
FILE* file = fopen(TRACE_OUTPUT_FILE, "a"); FILE* file = fopen(TRACE_OUTPUT_FILE, "a");
if(file) if(file)
...@@ -28,7 +29,7 @@ namespace gl ...@@ -28,7 +29,7 @@ namespace gl
vfprintf(file, format, vararg); vfprintf(file, format, vararg);
fclose(file); fclose(file);
} }
#endif }
} }
void trace(const char *format, ...) void trace(const char *format, ...)
......
...@@ -84,7 +84,7 @@ void Config::set(DisplayMode displayMode, EGLint minInterval, EGLint maxInterval ...@@ -84,7 +84,7 @@ void Config::set(DisplayMode displayMode, EGLint minInterval, EGLint maxInterval
mColorBufferType = EGL_RGB_BUFFER; mColorBufferType = EGL_RGB_BUFFER;
mConfigCaveat = (displayMode.format == renderTargetFormat) ? EGL_NONE : EGL_SLOW_CONFIG; mConfigCaveat = (displayMode.format == renderTargetFormat) ? EGL_NONE : EGL_SLOW_CONFIG;
mConfigID = 0; mConfigID = 0;
mConformant = EGL_OPENGL_ES2_BIT; mConformant = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT;
switch (depthStencilFormat) switch (depthStencilFormat)
{ {
...@@ -142,7 +142,7 @@ void Config::set(DisplayMode displayMode, EGLint minInterval, EGLint maxInterval ...@@ -142,7 +142,7 @@ void Config::set(DisplayMode displayMode, EGLint minInterval, EGLint maxInterval
mNativeRenderable = EGL_FALSE; mNativeRenderable = EGL_FALSE;
mNativeVisualID = 0; mNativeVisualID = 0;
mNativeVisualType = 0; mNativeVisualType = 0;
mRenderableType = EGL_OPENGL_ES2_BIT; mRenderableType = EGL_OPENGL_ES_BIT | EGL_OPENGL_ES2_BIT;
mSampleBuffers = multiSample ? 1 : 0; mSampleBuffers = multiSample ? 1 : 0;
mSamples = multiSample; mSamples = multiSample;
mSurfaceType = EGL_PBUFFER_BIT | EGL_WINDOW_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT; mSurfaceType = EGL_PBUFFER_BIT | EGL_WINDOW_BIT | EGL_SWAP_BEHAVIOR_PRESERVED_BIT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment