Merge branch 'vk_rt'

Dockerfile

@@ -6,45 +6,45 @@ FROM ubuntu:bionic as builder
 
 ENV DXC_BRANCH=master
 ENV DXC_REPO=https://github.com/Microsoft/DirectXShaderCompiler.git
-ENV DXC_COMMIT=3faf581d0ba031f62b054b1c09ccb1a9aa0e1305
+ENV DXC_COMMIT=b2b9185ca5bd9fc58b272f2929131b4f4f4adb7d
 
 ENV SHADERC_BRANCH=master
 ENV SHADERC_REPO=https://github.com/google/shaderc.git
-ENV SHADERC_COMMIT=b9e151baf0cff85bb1941c5568c22026339f7720
+ENV SHADERC_COMMIT=4b8446fc1703fc47330655869d8e68d264bb9ec4
 
 ENV GOOGLE_TEST_BRANCH=master
 ENV GOOGLE_TEST_REPO=https://github.com/google/googletest.git
-ENV GOOGLE_TEST_COMMIT=3880b13e4c0b04ca88f69b9c93da6058bd836c34
+ENV GOOGLE_TEST_COMMIT=8b6d3f9c4a774bef3081195d422993323b6bb2e0
 
 ENV GLSLANG_BRANCH=master
-ENV GLSLANG_REPO=https://github.com/google/glslang.git
-ENV GLSLANG_COMMIT=6eab476e5adcad71cf8b46a875eedd164f201c5d
+ENV GLSLANG_REPO=https://github.com/KhronosGroup/glslang.git
+ENV GLSLANG_COMMIT=80c36be4a9c58e87b4fc8383548d77fe962c145f
 
 ENV SPV_TOOLS_BRANCH=master
 ENV SPV_TOOLS_REPO=https://github.com/KhronosGroup/SPIRV-Tools.git
-ENV SPV_TOOLS_COMMIT=a87d3ce48e88a653e855c3245a6b68deeae58efc
+ENV SPV_TOOLS_COMMIT=07f80c4df1b0619ee484c38e79a7ad71f672ca14
 
 ENV SPV_HEADERS_BRANCH=master
 ENV SPV_HEADERS_REPO=https://github.com/KhronosGroup/SPIRV-Headers.git
-ENV SPV_HEADERS_COMMIT=46a3ae6dffc6f217a52e25556dba3d76f5634d61
+ENV SPV_HEADERS_COMMIT=03a081524afabdde274d885880c2fef213e46a59
 
 ENV RE2_BRANCH=master
 ENV RE2_REPO=https://github.com/google/re2.git
-ENV RE2_COMMIT=2cf86e5ab6dcfe045a1f510c2b9a8b012a4158cd
+ENV RE2_COMMIT=79ef3b2d31f06493f687ef9e947d9632bad54b9b
 
 ENV EFFCEE_BRANCH=master
 ENV EFFCEE_REPO=https://github.com/google/effcee.git
-ENV EFFCEE_COMMIT=8f0a61dc95e0df18c18e0ac56d83b3fa9d2fe90b
+ENV EFFCEE_COMMIT=b83b58d177b797edd1f94c5f10837f2cc2863f0a
 
-ENV WINE_BRANCH=dxil
-ENV WINE_REPO=https://github.com/gwihlidal/wine.git
-ENV WINE_COMMIT=052778ed354f39f688ecbda488a9164afd76484c
+ENV WINE_BRANCH=master
+ENV WINE_REPO=https://github.com/wine-mirror/wine.git
+ENV WINE_COMMIT=06531b1d9898ba3ac3b7c69d6192682202606f8f
 
 ENV SMOLV_BRANCH=master
 ENV SMOLV_REPO=https://github.com/aras-p/smol-v.git
 ENV SMOLV_COMMIT=9a787d1354a9e43c9ea6027cd310ce2a2fd78901
 
-ENV VULKAN_SDK=1.1.92.1
+ENV VULKAN_SDK=1.1.101.0
 
 # Prevents annoying debconf errors during builds
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -141,18 +141,18 @@ RUN wget -O vulkan.tgz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK}/linux/v
 	./setup-env.sh && ./build_tools.sh
 
 # Download and extract signing tool
-WORKDIR /
-RUN wget -O signing.zip https://github.com/gwihlidal/dxil-signing/releases/download/0.1.2/dxil-signing-0_1_2.zip && \
+WORKDIR /signing
+RUN wget -O signing.zip https://github.com/gwihlidal/dxil-signing/releases/download/0.1.4/dxil-signing-0_1_4.zip --no-check-certificate && \
 	unzip -q signing.zip; exit 0
-RUN mv dxil-signing-0_1_2 signing
+RUN rm signing.zip
 
 # Download and extract Linux and Windows binaries of AMD RGA
 WORKDIR /rga
-RUN wget -O rga_linux.tgz https://github.com/GPUOpen-Tools/RGA/releases/download/2.0.1/rga-linux-2.0.1.tgz && \
+RUN wget -O rga_linux.tgz https://github.com/GPUOpen-Tools/RGA/releases/download/2.1/rga-linux-2.1.tgz --no-check-certificate && \
 	tar zxf rga_linux.tgz && \
-	mv rga-2.0.1.* linux && \
+	mv rga-2.1.* linux && \
 	rm rga_linux.tgz && \
-	wget -O rga_windows.zip https://github.com/GPUOpen-Tools/RGA/releases/download/2.0.1/rga-windows-x64-2.0.1.zip && \
+	wget -O rga_windows.zip https://github.com/GPUOpen-Tools/RGA/releases/download/2.1/rga-windows-x64-2.1.zip --no-check-certificate && \
 	unzip -q rga_windows.zip; exit 0
 RUN mv bin windows && \
 	# Remove GUI binaries
@@ -217,7 +217,7 @@ COPY fxc_bin /app/fxc
 # Convenient path variables
 ENV DXC_PATH="/app/dxc/bin/dxc"
 ENV FXC_PATH="/app/fxc/fxc.exe"
-ENV SIGN_PATH="/app/signing/dxil-signing.exe"
+ENV SIGN_PATH="/app/signing/dxil-val.exe"
 ENV RGA_WIN_PATH="/app/rga/windows/rga.exe"
 ENV RGA_NIX_PATH="/app/rga/linux/rga"
 ENV GLSLC_PATH="/app/shaderc/glslc"

Makefile

@@ -1,5 +1,5 @@
 NS = gwihlidal
-VERSION ?= latest
+VERSION ?= vk_rt8
 
 REPO = docker-shader
 NAME = docker-shader