Advertise ES3 renderable in available configs

TRAC #22806 Signed-off-by: Geoff Lang Signed-off-by: Jamie Madill Author: Shannon Woods git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2089 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent f3c52491
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <GLES3/gl3ext.h> #include <GLES3/gl3ext.h>
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
#include <EGL/eglext.h>
#include "common/debug.h" #include "common/debug.h"
...@@ -124,6 +125,12 @@ Config::Config(rx::ConfigDesc desc, EGLint minInterval, EGLint maxInterval, EGLi ...@@ -124,6 +125,12 @@ Config::Config(rx::ConfigDesc desc, EGLint minInterval, EGLint maxInterval, EGLi
mTransparentRedValue = 0; mTransparentRedValue = 0;
mTransparentGreenValue = 0; mTransparentGreenValue = 0;
mTransparentBlueValue = 0; mTransparentBlueValue = 0;
if (desc.es3Capable)
{
mRenderableType |= EGL_OPENGL_ES3_BIT_KHR;
mConformant |= EGL_OPENGL_ES3_BIT_KHR;
}
} }
EGLConfig Config::getHandle() const EGLConfig Config::getHandle() const
......
...@@ -67,6 +67,7 @@ struct ConfigDesc ...@@ -67,6 +67,7 @@ struct ConfigDesc
GLenum depthStencilFormat; GLenum depthStencilFormat;
GLint multiSample; GLint multiSample;
bool fastConfig; bool fastConfig;
bool es3Capable;
}; };
struct dx_VertexConstants struct dx_VertexConstants
......
...@@ -445,6 +445,7 @@ int Renderer11::generateConfigs(ConfigDesc **configDescList) ...@@ -445,6 +445,7 @@ int Renderer11::generateConfigs(ConfigDesc **configDescList)
newConfig.depthStencilFormat = d3d11_gl::ConvertDepthStencilFormat(depthStencilFormat); newConfig.depthStencilFormat = d3d11_gl::ConvertDepthStencilFormat(depthStencilFormat);
newConfig.multiSample = 0; // FIXME: enumerate multi-sampling newConfig.multiSample = 0; // FIXME: enumerate multi-sampling
newConfig.fastConfig = true; // Assume all DX11 format conversions to be fast newConfig.fastConfig = true; // Assume all DX11 format conversions to be fast
newConfig.es3Capable = true;
(*configDescList)[numConfigs++] = newConfig; (*configDescList)[numConfigs++] = newConfig;
} }
......
...@@ -569,6 +569,7 @@ int Renderer9::generateConfigs(ConfigDesc **configDescList) ...@@ -569,6 +569,7 @@ int Renderer9::generateConfigs(ConfigDesc **configDescList)
newConfig.depthStencilFormat = d3d9_gl::ConvertDepthStencilFormat(depthStencilFormat); newConfig.depthStencilFormat = d3d9_gl::ConvertDepthStencilFormat(depthStencilFormat);
newConfig.multiSample = 0; // FIXME: enumerate multi-sampling newConfig.multiSample = 0; // FIXME: enumerate multi-sampling
newConfig.fastConfig = (currentDisplayMode.Format == renderTargetFormat); newConfig.fastConfig = (currentDisplayMode.Format == renderTargetFormat);
newConfig.es3Capable = false;
(*configDescList)[numConfigs++] = newConfig; (*configDescList)[numConfigs++] = newConfig;
} }
......
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