diff --git a/.gitignore b/.gitignore index dff0f8a..c9fc5d0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ streaming-agent/package-lock.json signaling.log streaming-agent/node_modules/ dxvk-cache +mesa-shader-cache diff --git a/Dockerfile b/Dockerfile index 2ca8e36..ff8ee8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,6 +53,9 @@ ENV VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/lvp_icd.x86_64.json" ENV XDG_RUNTIME_DIR=/tmp/weston-runtime ENV WAYLAND_DISPLAY=wayland-0 ENV DISPLAY=:99 +ENV LP_NATIVE_VECTOR_WIDTH=256 +ENV MESA_SHADER_CACHE_DIR=/home/ubuntu/.cache/mesa_shader_cache +ENV MESA_SHADER_CACHE_MAX_SIZE=10G # Copy frequently changing files last COPY start.sh /home/ubuntu/start.sh diff --git a/README.md b/README.md index b1626ad..b8de72c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ touch /home/gameservers/webclient_css_ze/dxvk-cache ./start-signaling.sh ## second run -docker run -d --name css-test -e SIG_URL=ws://172.17.0.1:3000 -e CONTAINER_NAME=css-test -e CF_APP_ID= -e CF_APP_TOKEN= -e CAP_FPS=60 -e CAP_W=800 -e CAP_H=600 --cpus="8.0" -v /home/gameservers/css_ze/cstrike/maps:/home/ubuntu/Counter-Strike\ Source/cstrike/maps:ro -v /home/gameservers/css_ze/cstrike/materials:/home/ubuntu/Counter-Strike\ Source/cstrike/materials:ro -v /home/gameservers/css_ze/cstrike/models:/home/ubuntu/Counter-Strike\ Source/cstrike/models:ro -v /home/gameservers/css_ze/cstrike/sound:/home/ubuntu/Counter-Strike\ Source/cstrike/sound:ro -v /home/gameservers/webclient_css_ze/dxvk-cache:/home/ubuntu/Counter-Strike\ Source/cstrike_win64.dxvk-cache css-client +docker run -d --name css-test -e SIG_URL=ws://172.17.0.1:3000 -e CONTAINER_NAME=css-test -e CF_APP_ID= -e CF_APP_TOKEN= -e CAP_FPS=60 -e CAP_W=800 -e CAP_H=600 --cpus="8.0" -v /home/gameservers/css_ze/cstrike/maps:/home/ubuntu/Counter-Strike\ Source/cstrike/maps:ro -v /home/gameservers/css_ze/cstrike/materials:/home/ubuntu/Counter-Strike\ Source/cstrike/materials:ro -v /home/gameservers/css_ze/cstrike/models:/home/ubuntu/Counter-Strike\ Source/cstrike/models:ro -v /home/gameservers/css_ze/cstrike/sound:/home/ubuntu/Counter-Strike\ Source/cstrike/sound:ro -v /home/gameservers/webclient_css_ze/dxvk-cache:/home/ubuntu/Counter-Strike\ Source/cstrike_win64.dxvk-cache -v /home/gameservers/webclient_css_ze/mesa-shader-cache:/home/ubuntu/.cache/mesa_shader_cache css-client ## docker logs -f css-test ## pkill -f signaling-server.js @@ -36,3 +36,5 @@ docker run -d --name css-test -e SIG_URL=ws://172.17.0.1:3000 -e CONTAINER_NAME= ## the client launches the game with -vulkan parameter specified in the rev.ini. ## CSS DirectX9 → built-in DXVK → Vulkan → Wine Wayland driver → Weston (lavapipe/llvmpipe) → Xwayland → X11 → ximagesrc capture for gst_agent + +## using DXVK cache and MESA_SHADER_CACHE which are mounted volumes