Compare commits
6 Commits
3aeae2e81e
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| ad6b94be53 | |||
| f67522cbfc | |||
| e422f44377 | |||
| 8d5fc4eaae | |||
| 546f96b6d0 | |||
| 770c17349d |
+24
-5
@@ -2,16 +2,14 @@ FROM ubuntu-hlsdk
|
|||||||
|
|
||||||
# Avoid interactive prompts during package installation
|
# Avoid interactive prompts during package installation
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
ENV VULKAN_SDK_VERSION=1.4.341.1
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
# Install Vulkan SDK repos
|
RUN apt-get update && apt-get full-upgrade -y && apt-get autoremove -y
|
||||||
RUN wget -qO- https://packages.lunarg.com/lunarg-signing-key-pub.asc | tee /etc/apt/trusted.gpg.d/lunarg.asc \
|
|
||||||
&& wget -qO /etc/apt/sources.list.d/lunarg-vulkan-noble.list http://packages.lunarg.com/vulkan/lunarg-vulkan-noble.list
|
|
||||||
|
|
||||||
# Install system dependencies and development packages
|
# Install system dependencies and development packages
|
||||||
RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
|
RUN apt-get install --no-install-recommends --no-install-suggests -y \
|
||||||
vulkan-sdk \
|
|
||||||
libsdl2-dev \
|
libsdl2-dev \
|
||||||
libfreetype-dev \
|
libfreetype-dev \
|
||||||
\
|
\
|
||||||
@@ -33,6 +31,27 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
|
|||||||
libvulkan1 \
|
libvulkan1 \
|
||||||
imagemagick
|
imagemagick
|
||||||
|
|
||||||
|
# Install Vulkan SDK runtime dependencies only
|
||||||
|
#RUN apt-get update && apt-get install -y \
|
||||||
|
# libxcb-xinput0 libxcb-xinerama0 libxcb-cursor-dev
|
||||||
|
|
||||||
|
# Install Vulkan SDK
|
||||||
|
RUN mkdir -p /opt/VulkanSDK && wget -qO- \
|
||||||
|
https://sdk.lunarg.com/sdk/download/${VULKAN_SDK_VERSION}/linux/vulkansdk-linux-x86_64-${VULKAN_SDK_VERSION}.tar.xz | \
|
||||||
|
tar -xJ -C /opt/VulkanSDK/
|
||||||
|
|
||||||
|
ENV VULKAN_SDK=/opt/VulkanSDK/${VULKAN_SDK_VERSION}/x86_64
|
||||||
|
ENV PATH=$VULKAN_SDK/bin:$PATH
|
||||||
|
ENV LD_LIBRARY_PATH="$VULKAN_SDK/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
|
||||||
|
ENV VK_ADD_LAYER_PATH="$VULKAN_SDK/share/vulkan/explicit_layer.d${VK_ADD_LAYER_PATH:+:$VK_ADD_LAYER_PATH}"
|
||||||
|
ENV PKG_CONFIG_PATH="$VULKAN_SDK/share/pkgconfig:$VULKAN_SDK/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
|
||||||
|
|
||||||
|
# Common dev utils
|
||||||
|
RUN apt-get install --no-install-recommends --no-install-suggests -y \
|
||||||
|
ripgrep \
|
||||||
|
less \
|
||||||
|
fd-find
|
||||||
|
|
||||||
# Remove extra cache after all the installations
|
# Remove extra cache after all the installations
|
||||||
RUN rm -rf /var/lib/apt/lists/*
|
RUN rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
|
# just podman things
|
||||||
|
export DBUS_SESSION_BUS_ADDRESS=
|
||||||
|
|
||||||
NAME=xash-builder
|
NAME=xash-builder
|
||||||
|
|
||||||
HLRTEST_REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
|
HLRTEST_REPO_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
|
||||||
@@ -67,6 +70,7 @@ render-test() {
|
|||||||
-e PBR_REVISION="${PBR_REVISION}" \
|
-e PBR_REVISION="${PBR_REVISION}" \
|
||||||
\
|
\
|
||||||
-v /dev/dri/renderD128:/dev/dri/renderD128:ro \
|
-v /dev/dri/renderD128:/dev/dri/renderD128:ro \
|
||||||
|
-v /etc/localtime:/etc/localtime:ro \
|
||||||
\
|
\
|
||||||
-v /opt/hl \
|
-v /opt/hl \
|
||||||
-v /home/ubuntu \
|
-v /home/ubuntu \
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -150,7 +150,7 @@ def render():
|
|||||||
print('Running xash3d...')
|
print('Running xash3d...')
|
||||||
mkdir_p(f'{args.xash_dir}/valve/rendertest')
|
mkdir_p(f'{args.xash_dir}/valve/rendertest')
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
env['LD_LIBRARY_PATH'] = f'{args.xash_dir}'
|
env['LD_LIBRARY_PATH'] = f'{args.xash_dir}:{env["LD_LIBRARY_PATH"]}'
|
||||||
|
|
||||||
start_time_sec = time.perf_counter()
|
start_time_sec = time.perf_counter()
|
||||||
with open(f'{WORKDIR}/xash-stdout.log', 'wb') as stdout, open(f'{WORKDIR}/xash-stderr.log', 'wb') as stderr:
|
with open(f'{WORKDIR}/xash-stdout.log', 'wb') as stdout, open(f'{WORKDIR}/xash-stderr.log', 'wb') as stderr:
|
||||||
|
|||||||
Reference in New Issue
Block a user