Skip to content

A
angle
Commit 47ee6a7b by Peng Huang Committed by Commit Bot
Options

Add build flags to disable desktop gl backend

This change saves about 100KB on Android Bug: angleproject:5490 Change-Id: Ieca0e597423f74a917197f381560af5409a9e874 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2601341Reviewed-by: 's avatarJonah Ryan-Davis <jonahr@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Peng Huang <penghuang@chromium.org>
parent 093250e0
Showing with 14 additions and 2 deletions
gni/angle.gni
...@@ -119,6 +119,7 @@ declare_args() { ...@@ -119,6 +119,7 @@ declare_args() {
angle_enable_null = true angle_enable_null = true
angle_enable_essl = true angle_enable_essl = true
angle_enable_glsl = true angle_enable_glsl = true
angle_enable_gl_desktop = !is_android && !is_ios
# http://anglebug.com/2634 # http://anglebug.com/2634
angle_enable_metal = is_mac angle_enable_metal = is_mac
......
scripts/code_generation_hashes/OpenGL_dispatch_table.json
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
"src/libANGLE/renderer/angle_format.py": "src/libANGLE/renderer/angle_format.py":
"32ba71942c0fd00e6807104f1bb80a3c", "32ba71942c0fd00e6807104f1bb80a3c",
"src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp": "src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp":
"a69c680f24dfe0af1482e09a0b93716d", "fd5bc9c4871e2ee3c70b1747d3e241be",
"src/libANGLE/renderer/gl/DispatchTableGL_autogen.h": "src/libANGLE/renderer/gl/DispatchTableGL_autogen.h":
"9669b0268a205a1231160af0041c8123", "9669b0268a205a1231160af0041c8123",
"src/libANGLE/renderer/gl/generate_gl_dispatch_table.py": "src/libANGLE/renderer/gl/generate_gl_dispatch_table.py":
"4f19a7eee17679b3a0ad4abad6fab2c9", "3471991f8743e4d25d68d973de9cac23",
"src/libANGLE/renderer/gl/gl_bindings_data.json": "src/libANGLE/renderer/gl/gl_bindings_data.json":
"b637d9cf24bb25002116cbfdddd2dd90", "b637d9cf24bb25002116cbfdddd2dd90",
"src/libANGLE/renderer/gl/null_functions.cpp": "src/libANGLE/renderer/gl/null_functions.cpp":
......
src/libANGLE/renderer/gl/BUILD.gn
...@@ -227,6 +227,9 @@ if (angle_enable_gl_null) { ...@@ -227,6 +227,9 @@ if (angle_enable_gl_null) {
config("angle_gl_backend_config") { config("angle_gl_backend_config") {
defines = [ "ANGLE_ENABLE_OPENGL" ] defines = [ "ANGLE_ENABLE_OPENGL" ]
if (angle_enable_gl_desktop) {
defines += [ "ANGLE_ENABLE_OPENGL_DESKTOP" ]
}
if (angle_enable_gl_null) { if (angle_enable_gl_null) {
defines += [ "ANGLE_ENABLE_OPENGL_NULL" ] defines += [ "ANGLE_ENABLE_OPENGL_NULL" ]
} }
......
src/libANGLE/renderer/gl/DispatchTableGL_autogen.cpp
...@@ -29,6 +29,7 @@ DispatchTableGL::DispatchTableGL() = default; ...@@ -29,6 +29,7 @@ DispatchTableGL::DispatchTableGL() = default;
void DispatchTableGL::initProcsDesktopGL(const gl::Version &version, void DispatchTableGL::initProcsDesktopGL(const gl::Version &version,
const std::set<std::string> &extensions) const std::set<std::string> &extensions)
{ {
#if defined(ANGLE_ENABLE_OPENGL_DESKTOP)
if (version >= gl::Version(1, 0)) if (version >= gl::Version(1, 0))
{ {
ASSIGN("glBlendFunc", blendFunc); ASSIGN("glBlendFunc", blendFunc);
...@@ -1915,6 +1916,7 @@ void DispatchTableGL::initProcsDesktopGL(const gl::Version &version, ...@@ -1915,6 +1916,7 @@ void DispatchTableGL::initProcsDesktopGL(const gl::Version &version,
ASSIGN("glClearDepthfOES", clearDepthf); ASSIGN("glClearDepthfOES", clearDepthf);
ASSIGN("glDepthRangefOES", depthRangef); ASSIGN("glDepthRangefOES", depthRangef);
} }
#endif // defined(ANGLE_ENABLE_OPENGL_DESKTOP)
} }
void DispatchTableGL::initProcsGLES(const gl::Version &version, void DispatchTableGL::initProcsGLES(const gl::Version &version,
...@@ -2801,6 +2803,7 @@ void DispatchTableGL::initProcsSharedExtensions(const std::set<std::string> &ext ...@@ -2801,6 +2803,7 @@ void DispatchTableGL::initProcsSharedExtensions(const std::set<std::string> &ext
void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version, void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version,
const std::set<std::string> &extensions) const std::set<std::string> &extensions)
{ {
# if defined(ANGLE_ENABLE_OPENGL_DESKTOP)
if (version >= gl::Version(1, 0)) if (version >= gl::Version(1, 0))
{ {
blendFunc = &glBlendFuncNULL; blendFunc = &glBlendFuncNULL;
...@@ -4684,6 +4687,7 @@ void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version, ...@@ -4684,6 +4687,7 @@ void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version,
clearDepthf = &glClearDepthfNULL; clearDepthf = &glClearDepthfNULL;
depthRangef = &glDepthRangefNULL; depthRangef = &glDepthRangefNULL;
} }
# endif // defined(ANGLE_ENABLE_OPENGL_DESKTOP)
} }
void DispatchTableGL::initProcsGLESNULL(const gl::Version &version, void DispatchTableGL::initProcsGLESNULL(const gl::Version &version,
......
src/libANGLE/renderer/gl/generate_gl_dispatch_table.py
...@@ -119,9 +119,11 @@ DispatchTableGL::DispatchTableGL() = default; ...@@ -119,9 +119,11 @@ DispatchTableGL::DispatchTableGL() = default;
void DispatchTableGL::initProcsDesktopGL(const gl::Version &version, const std::set<std::string> &extensions) void DispatchTableGL::initProcsDesktopGL(const gl::Version &version, const std::set<std::string> &extensions)
{{ {{
#if defined(ANGLE_ENABLE_OPENGL_DESKTOP)
{gl_data} {gl_data}
{gl_extensions_data} {gl_extensions_data}
#endif // defined(ANGLE_ENABLE_OPENGL_DESKTOP)
}} }}
void DispatchTableGL::initProcsGLES(const gl::Version &version, const std::set<std::string> &extensions) void DispatchTableGL::initProcsGLES(const gl::Version &version, const std::set<std::string> &extensions)
...@@ -139,9 +141,11 @@ void DispatchTableGL::initProcsSharedExtensions(const std::set<std::string> &ext ...@@ -139,9 +141,11 @@ void DispatchTableGL::initProcsSharedExtensions(const std::set<std::string> &ext
#if defined(ANGLE_ENABLE_OPENGL_NULL) #if defined(ANGLE_ENABLE_OPENGL_NULL)
void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version, const std::set<std::string> &extensions) void DispatchTableGL::initProcsDesktopGLNULL(const gl::Version &version, const std::set<std::string> &extensions)
{{ {{
#if defined(ANGLE_ENABLE_OPENGL_DESKTOP)
{gl_null_data} {gl_null_data}
{gl_null_extensions_data} {gl_null_extensions_data}
#endif // defined(ANGLE_ENABLE_OPENGL_DESKTOP)
}} }}
void DispatchTableGL::initProcsGLESNULL(const gl::Version &version, const std::set<std::string> &extensions) void DispatchTableGL::initProcsGLESNULL(const gl::Version &version, const std::set<std::string> &extensions)
......
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