diff --git a/cmake/cef_variables.cmake.in b/cmake/cef_variables.cmake.in index 4d8a309f0..e1e4c9c36 100644 --- a/cmake/cef_variables.cmake.in +++ b/cmake/cef_variables.cmake.in @@ -222,8 +222,11 @@ if(OS_LINUX) libcef.so libEGL.so libGLESv2.so + libvk_swiftshader.so + libvulkan.so.1 snapshot_blob.bin v8_context_snapshot.bin + vk_swiftshader_icd.json swiftshader ) @@ -470,6 +473,9 @@ if(OS_WINDOWS) libGLESv2.dll snapshot_blob.bin v8_context_snapshot.bin + vk_swiftshader.dll + vk_swiftshader_icd.json + vulkan-1.dll swiftshader ) diff --git a/tools/distrib/linux/README.redistrib.txt b/tools/distrib/linux/README.redistrib.txt index 85710f92b..a0374ce67 100644 --- a/tools/distrib/linux/README.redistrib.txt +++ b/tools/distrib/linux/README.redistrib.txt @@ -47,14 +47,24 @@ run but any related functionality may become broken or disabled. These files contain non-localized resources used by CEF, Chromium and Blink. Without these files arbitrary Web components may display incorrectly. -* Angle support. +* ANGLE support. * libEGL.so * libGLESv2.so - Without these files HTML5 accelerated content like 2D canvas, 3D CSS and WebGL - will not function. + Support for rendering of HTML5 content like 2D canvas, 3D CSS and WebGL. + Without these files the aforementioned capabilities may fail. -* SwiftShader support. +* SwANGLE support. + * libvk_swiftshader.so + * libvulkan.so.1 + * vk_swiftshader_icd.json + Support for software rendering of HTML5 content like 2D canvas, 3D CSS and + WebGL using SwiftShader's Vulkan library as ANGLE's Vulkan backend. Without + these files the aforementioned capabilities may fail when GPU acceleration is + disabled or unavailable. + +* SwiftShader support * swiftshader/libEGL.so * swiftshader/libGLESv2.so - Without these files WebGL will not function in software-only mode when the GPU - is not available or disabled. + Deprecated support for software rendering using SwiftShader's GL libraries. + Used as an alternative to SwANGLE when the `--use-gl=swiftshader-webgl` + command-line flag is specified. diff --git a/tools/distrib/mac/README.redistrib.txt b/tools/distrib/mac/README.redistrib.txt index 2b9c23622..d0575d447 100644 --- a/tools/distrib/mac/README.redistrib.txt +++ b/tools/distrib/mac/README.redistrib.txt @@ -15,10 +15,12 @@ cefclient.app/ Chromium Embedded Framework.framework/ Chromium Embedded Framework <= main application library Libraries/ - libEGL.dylib <= angle support libraries + libEGL.dylib <= ANGLE support libraries libGLESv2.dylib <=^ - libswiftshader_libEGL.dylib <= swiftshader support libraries + libswiftshader_libEGL.dylib <= SwiftShader support libraries libswiftshader_libGLESv2.dylib <=^ + libvk_swiftshader.dylib <= SwANGLE support libraries + vk_swiftshader_icd.json <=^ Resources/ chrome_100_percent.pak <= non-localized resources and strings chrome_200_percent.pak <=^ @@ -91,14 +93,23 @@ run but any related functionality may become broken or disabled. These files contain non-localized resources used by CEF, Chromium and Blink. Without these files arbitrary Web components may display incorrectly. -* Angle support. +* ANGLE support. * Chromium Embedded Framework.framework/Libraries/libEGL.dylib * Chromium Embedded Framework.framework/Libraries/libGLESv2.dylib - Without these files HTML5 accelerated content like 2D canvas, 3D CSS and WebGL - will not function. + Support for rendering of HTML5 content like 2D canvas, 3D CSS and WebGL. + Without these files the aforementioned capabilities may fail. -* SwiftShader support. +* SwANGLE support. + * Chromium Embedded Framework.framework/Libraries/libvk_swiftshader.dylib + * Chromium Embedded Framework.framework/Libraries/vk_swiftshader_icd.json + Support for software rendering of HTML5 content like 2D canvas, 3D CSS and + WebGL using SwiftShader's Vulkan library as ANGLE's Vulkan backend. Without + these files the aforementioned capabilities may fail when GPU acceleration is + disabled or unavailable. + +* SwiftShader support * Chromium Embedded Framework.framework/Libraries/libswiftshader_libEGL.dylib * Chromium Embedded Framework.framework/Libraries/libswiftshader_libGLESv2.dylib - Without these files WebGL will not function in software-only mode when the GPU - is not available or disabled. + Deprecated support for software rendering using SwiftShader's GL libraries. + Used as an alternative to SwANGLE when the `--use-gl=swiftshader-webgl` + command-line flag is specified. diff --git a/tools/distrib/win/README.redistrib.txt b/tools/distrib/win/README.redistrib.txt index 709c8d834..bc2bbab15 100644 --- a/tools/distrib/win/README.redistrib.txt +++ b/tools/distrib/win/README.redistrib.txt @@ -48,15 +48,32 @@ run but any related functionality may become broken or disabled. These files contain non-localized resources used by CEF, Chromium and Blink. Without these files arbitrary Web components may display incorrectly. -* Angle and Direct3D support. - * d3dcompiler_47.dll (required for Windows Vista and newer) +* Direct3D support. + * d3dcompiler_47.dll + Support for GPU accelerated rendering of HTML5 content like 2D canvas, 3D CSS + and WebGL. Without this file the aforementioned capabilities may fail when GPU + acceleration is enabled (default in most cases). Use of this bundled version + is recommended instead of relying on the possibly old and untested system + installed version. + +* ANGLE support. * libEGL.dll * libGLESv2.dll - Without these files HTML5 accelerated content like 2D canvas, 3D CSS and WebGL - will not function. + Support for rendering of HTML5 content like 2D canvas, 3D CSS and WebGL. + Without these files the aforementioned capabilities may fail. -* SwiftShader support. +* SwANGLE support. + * vk_swiftshader.dll + * vk_swiftshader_icd.json + * vulkan-1.dll + Support for software rendering of HTML5 content like 2D canvas, 3D CSS and + WebGL using SwiftShader's Vulkan library as ANGLE's Vulkan backend. Without + these files the aforementioned capabilities may fail when GPU acceleration is + disabled or unavailable. + +* SwiftShader support * swiftshader/libEGL.dll * swiftshader/libGLESv2.dll - Without these files WebGL will not function in software-only mode when the GPU - is not available or disabled. + Deprecated support for software rendering using SwiftShader's GL libraries. + Used as an alternative to SwANGLE when the `--use-gl=swiftshader-webgl` + command-line flag is specified. diff --git a/tools/make_distrib.py b/tools/make_distrib.py index 798fd6a0a..9bf65c6f0 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -852,6 +852,9 @@ if platform == 'windows': {'path': 'libGLESv2.dll'}, {'path': 'snapshot_blob.bin', 'conditional': True}, {'path': 'v8_context_snapshot.bin', 'conditional': True}, + {'path': 'vk_swiftshader.dll'}, + {'path': 'vk_swiftshader_icd.json'}, + {'path': 'vulkan-1.dll'}, {'path': 'swiftshader\\libEGL.dll'}, {'path': 'swiftshader\\libGLESv2.dll'}, ] @@ -1167,8 +1170,11 @@ elif platform == 'linux': {'path': libcef_so}, {'path': 'libEGL.so'}, {'path': 'libGLESv2.so'}, + {'path': 'libvk_swiftshader.so'}, + {'path': 'libvulkan.so.1'}, {'path': 'snapshot_blob.bin', 'conditional': True}, {'path': 'v8_context_snapshot.bin', 'conditional': True}, + {'path': 'vk_swiftshader_icd.json'}, {'path': 'swiftshader/libEGL.so'}, {'path': 'swiftshader/libGLESv2.so'}, ]