diff --git a/src/CMakeModules/Bootstrap_Windows.cmake b/src/CMakeModules/Bootstrap_Windows.cmake index 2f3fe5085a..102a8516bc 100644 --- a/src/CMakeModules/Bootstrap_Windows.cmake +++ b/src/CMakeModules/Bootstrap_Windows.cmake @@ -164,28 +164,26 @@ casparcg_add_runtime_dependency("${LIBERATION_FONTS_BIN_PATH}/LiberationMono-Reg # CEF if (ENABLE_HTML) - set(CEF_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/casparcg.cef.sdk.95.0.1-MediaHandler.2467/CEF") - set(CEF_BIN_PATH "${NUGET_PACKAGES_FOLDER}/casparcg.cef.redist.x64.95.0.1-MediaHandler.2467/CEF") - set(CEF_RESOURCE_PATH "${NUGET_PACKAGES_FOLDER}/casparcg.cef.redist.x64.95.0.1-MediaHandler.2467/CEF") - link_directories("${NUGET_PACKAGES_FOLDER}/casparcg.cef.sdk.95.0.1-MediaHandler.2467/CEF/x64") + set(CEF_INCLUDE_PATH "${NUGET_PACKAGES_FOLDER}/cef.sdk.117.2.2/CEF") + set(CEF_BIN_PATH "${NUGET_PACKAGES_FOLDER}/cef.redist.x64.117.2.2/CEF") + set(CEF_RESOURCE_PATH "${NUGET_PACKAGES_FOLDER}/cef.redist.x64.117.2.2/CEF") + link_directories("${NUGET_PACKAGES_FOLDER}/cef.sdk.117.2.2/CEF/x64") casparcg_add_runtime_dependency_dir("${CEF_RESOURCE_PATH}/locales") casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/chrome_100_percent.pak") casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/chrome_200_percent.pak") casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/resources.pak") casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/icudtl.dat") - - casparcg_add_runtime_dependency_dir("${CEF_BIN_PATH}/swiftshader") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/snapshot_blob.bin") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/v8_context_snapshot.bin") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/libcef.dll") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/chrome_elf.dll") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/d3dcompiler_47.dll") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/libEGL.dll") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/libGLESv2.dll") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/vk_swiftshader.dll") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/vk_swiftshader_icd.json") - casparcg_add_runtime_dependency("${CEF_BIN_PATH}/vulkan-1.dll") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/snapshot_blob.bin") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/v8_context_snapshot.bin") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/libcef.dll") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/chrome_elf.dll") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/d3dcompiler_47.dll") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/libEGL.dll") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/libGLESv2.dll") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/vk_swiftshader.dll") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/vk_swiftshader_icd.json") + casparcg_add_runtime_dependency("${CEF_RESOURCE_PATH}/vulkan-1.dll") endif () set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/src/modules/html/packages.config b/src/modules/html/packages.config index 71e40cff2f..b894782bb0 100644 --- a/src/modules/html/packages.config +++ b/src/modules/html/packages.config @@ -1,6 +1,6 @@  - - + + diff --git a/src/modules/html/producer/html_producer.cpp b/src/modules/html/producer/html_producer.cpp index 77a012b445..b08ea9216b 100644 --- a/src/modules/html/producer/html_producer.cpp +++ b/src/modules/html/producer/html_producer.cpp @@ -323,6 +323,7 @@ class html_client * This is where the shared textures get fed into. It is specific to the obs builds (hence the 2 suffix), so might * be removed/renamed when the change is accepted upstream */ + /* void OnAcceleratedPaint2(CefRefPtr browser, PaintElementType type, const RectList& dirtyRects, @@ -378,6 +379,7 @@ class html_client CASPAR_LOG_CURRENT_EXCEPTION(); } } + */ #endif void OnAfterCreated(CefRefPtr browser) override @@ -514,7 +516,7 @@ class html_producer : public core::frame_producer bool shared_texture_enable = false; #ifdef WIN32 - shared_texture_enable = enable_gpu && accelerator::d3d::d3d_device::get_device(); + // shared_texture_enable = enable_gpu && accelerator::d3d::d3d_device::get_device(); #endif client_ = new html_client(frame_factory, graph_, format_desc, shared_texture_enable, url_);