Skip to content

A
angle
Commit 4262ea04 by Xiaoxuan Liu Committed by Commit Bot
Options

Vulkan: Add gles1 conformance support.

For Khnoros CTS1 support, ANGLE needs to add conformant and rendererType for OpenGL ES1 version. Bug: angleproject:4457 Change-Id: I58ac4672352d3d42e4b8403b80f86154b6a76edc Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2160515 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent fbc2f063
Showing with 4 additions and 2 deletions
src/libANGLE/renderer/vulkan/vk_caps_utils.cpp
...@@ -614,6 +614,8 @@ egl::Config GenerateDefaultConfig(const RendererVk *renderer, ...@@ -614,6 +614,8 @@ egl::Config GenerateDefaultConfig(const RendererVk *renderer,
renderer->getPhysicalDeviceProperties(); renderer->getPhysicalDeviceProperties();
gl::Version maxSupportedESVersion = renderer->getMaxSupportedESVersion(); gl::Version maxSupportedESVersion = renderer->getMaxSupportedESVersion();
// ES3 features are required to emulate ES1
EGLint es1Support = (maxSupportedESVersion.major >= 3 ? EGL_OPENGL_ES_BIT : 0);
EGLint es2Support = (maxSupportedESVersion.major >= 2 ? EGL_OPENGL_ES2_BIT : 0); EGLint es2Support = (maxSupportedESVersion.major >= 2 ? EGL_OPENGL_ES2_BIT : 0);
EGLint es3Support = (maxSupportedESVersion.major >= 3 ? EGL_OPENGL_ES3_BIT : 0); EGLint es3Support = (maxSupportedESVersion.major >= 3 ? EGL_OPENGL_ES3_BIT : 0);
...@@ -631,7 +633,7 @@ egl::Config GenerateDefaultConfig(const RendererVk *renderer, ...@@ -631,7 +633,7 @@ egl::Config GenerateDefaultConfig(const RendererVk *renderer,
config.bindToTextureRGBA = colorFormat.format == GL_RGBA || colorFormat.format == GL_BGRA_EXT; config.bindToTextureRGBA = colorFormat.format == GL_RGBA || colorFormat.format == GL_BGRA_EXT;
config.colorBufferType = EGL_RGB_BUFFER; config.colorBufferType = EGL_RGB_BUFFER;
config.configCaveat = GetConfigCaveat(colorFormat.internalFormat); config.configCaveat = GetConfigCaveat(colorFormat.internalFormat);
config.conformant = es2Support | es3Support; config.conformant = es1Support | es2Support | es3Support;
config.depthSize = depthStencilFormat.depthBits; config.depthSize = depthStencilFormat.depthBits;
config.stencilSize = depthStencilFormat.stencilBits; config.stencilSize = depthStencilFormat.stencilBits;
config.level = 0; config.level = 0;
...@@ -644,7 +646,7 @@ egl::Config GenerateDefaultConfig(const RendererVk *renderer, ...@@ -644,7 +646,7 @@ egl::Config GenerateDefaultConfig(const RendererVk *renderer,
config.nativeRenderable = EGL_TRUE; config.nativeRenderable = EGL_TRUE;
config.nativeVisualID = static_cast<EGLint>(GetNativeVisualID(colorFormat)); config.nativeVisualID = static_cast<EGLint>(GetNativeVisualID(colorFormat));
config.nativeVisualType = EGL_NONE; config.nativeVisualType = EGL_NONE;
config.renderableType = es2Support | es3Support; config.renderableType = es1Support | es2Support | es3Support;
config.sampleBuffers = (sampleCount > 0) ? 1 : 0; config.sampleBuffers = (sampleCount > 0) ? 1 : 0;
config.samples = sampleCount; config.samples = sampleCount;
config.surfaceType = EGL_WINDOW_BIT | EGL_PBUFFER_BIT; config.surfaceType = EGL_WINDOW_BIT | EGL_PBUFFER_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