From 6858bd4c5faaca20bc10583d390d8418750792d7 Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Tue, 8 Jan 2019 02:56:45 +0100 Subject: [PATCH 1/9] Use VK RT branch --- Dockerfile | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f7c8c4c..8ebc600 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,9 @@ FROM ubuntu:bionic as builder -ENV DXC_BRANCH=master -ENV DXC_REPO=https://github.com/Microsoft/DirectXShaderCompiler.git -ENV DXC_COMMIT=3faf581d0ba031f62b054b1c09ccb1a9aa0e1305 +ENV DXC_BRANCH=NV_ray_tracing +ENV DXC_REPO=https://github.com/sparmarNV/DirectXShaderCompiler.git +ENV DXC_COMMIT=63e92ea5619bca856193992bb6988590bd9e26c7 ENV SHADERC_BRANCH=master ENV SHADERC_REPO=https://github.com/google/shaderc.git diff --git a/Makefile b/Makefile index 9167597..63bd7b0 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NS = gwihlidal -VERSION ?= latest +VERSION ?= vk_rt REPO = docker-shader NAME = docker-shader From 4420ffd0e3b697f9ba9f6c69e91b2233c0ab6473 Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Sun, 20 Jan 2019 16:04:57 +0100 Subject: [PATCH 2/9] Switch to NV's new VK RT branch --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8ebc600..55db60c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,9 @@ FROM ubuntu:bionic as builder -ENV DXC_BRANCH=NV_ray_tracing +ENV DXC_BRANCH=NV_ray_tracing_v2 ENV DXC_REPO=https://github.com/sparmarNV/DirectXShaderCompiler.git -ENV DXC_COMMIT=63e92ea5619bca856193992bb6988590bd9e26c7 +ENV DXC_COMMIT=53d6f3486a81a17c33d6e8ac69e46a1026ce9d11 ENV SHADERC_BRANCH=master ENV SHADERC_REPO=https://github.com/google/shaderc.git From 55356bd0381aa250579273fc01c342d6b6d3c6a1 Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Sun, 20 Jan 2019 17:26:53 +0100 Subject: [PATCH 3/9] Use custom fork with build fix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55db60c..45130d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ FROM ubuntu:bionic as builder ENV DXC_BRANCH=NV_ray_tracing_v2 -ENV DXC_REPO=https://github.com/sparmarNV/DirectXShaderCompiler.git -ENV DXC_COMMIT=53d6f3486a81a17c33d6e8ac69e46a1026ce9d11 +ENV DXC_REPO=https://github.com/gwihlidal/DirectXShaderCompiler.git +ENV DXC_COMMIT=77106f54303d000a10da673f1de0876470ea0fd3 ENV SHADERC_BRANCH=master ENV SHADERC_REPO=https://github.com/google/shaderc.git From 6fd93c9c49c66d78680c590b25949a8dcb69b54f Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Wed, 23 Jan 2019 18:57:37 +0100 Subject: [PATCH 4/9] Bug fix PR was merged, switching back to official RT branch and depot --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45130d1..46b2a10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ FROM ubuntu:bionic as builder ENV DXC_BRANCH=NV_ray_tracing_v2 -ENV DXC_REPO=https://github.com/gwihlidal/DirectXShaderCompiler.git -ENV DXC_COMMIT=77106f54303d000a10da673f1de0876470ea0fd3 +ENV DXC_REPO=https://github.com/sparmarNV/DirectXShaderCompiler.git +ENV DXC_COMMIT=8d41a8cc880b63717e973096bf2f8275e23a9ee3 ENV SHADERC_BRANCH=master ENV SHADERC_REPO=https://github.com/google/shaderc.git From ddeeeca733a497715b28f4d312c25593c067c6b3 Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Sun, 17 Feb 2019 18:48:46 +0100 Subject: [PATCH 5/9] Version bumps, and use patched dxc for dxr --- Dockerfile | 22 +++++++++++----------- Makefile | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46b2a10..0e563ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,37 +4,37 @@ FROM ubuntu:bionic as builder -ENV DXC_BRANCH=NV_ray_tracing_v2 -ENV DXC_REPO=https://github.com/sparmarNV/DirectXShaderCompiler.git -ENV DXC_COMMIT=8d41a8cc880b63717e973096bf2f8275e23a9ee3 +ENV DXC_BRANCH=NV_ray_tracing_final +ENV DXC_REPO=https://github.com/gwihlidal/DirectXShaderCompiler.git +ENV DXC_COMMIT=bf1bb935034b398396434a094a3d0650b34f3514 ENV SHADERC_BRANCH=master ENV SHADERC_REPO=https://github.com/google/shaderc.git -ENV SHADERC_COMMIT=b9e151baf0cff85bb1941c5568c22026339f7720 +ENV SHADERC_COMMIT=419517b1595ffcf14c6098c3c1af09e7033e09df ENV GOOGLE_TEST_BRANCH=master ENV GOOGLE_TEST_REPO=https://github.com/google/googletest.git -ENV GOOGLE_TEST_COMMIT=3880b13e4c0b04ca88f69b9c93da6058bd836c34 +ENV GOOGLE_TEST_COMMIT=d850e144710e330070b756c009749dc7a7302301 ENV GLSLANG_BRANCH=master ENV GLSLANG_REPO=https://github.com/google/glslang.git -ENV GLSLANG_COMMIT=6eab476e5adcad71cf8b46a875eedd164f201c5d +ENV GLSLANG_COMMIT=9983f99e87ab0b6608b236ea59bcf873f90e1435 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=6d20f625702698dda6b5cda29dfadb9aa1f40092 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=8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23 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 @@ -44,7 +44,7 @@ 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.97.0 # Prevents annoying debconf errors during builds ARG DEBIAN_FRONTEND="noninteractive" diff --git a/Makefile b/Makefile index 63bd7b0..fb2f66e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NS = gwihlidal -VERSION ?= vk_rt +VERSION ?= vk_rt3 REPO = docker-shader NAME = docker-shader From 0fe6346415574241b1c946d940ded30898a01006 Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Mon, 18 Feb 2019 06:32:36 +0100 Subject: [PATCH 6/9] Bump version of signing tool --- Dockerfile | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e563ca..d3806d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -142,9 +142,9 @@ RUN wget -O vulkan.tgz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK}/linux/v # 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 && \ +RUN wget -O signing.zip https://github.com/gwihlidal/dxil-signing/releases/download/0.1.3/dxil-signing-0_1_3.zip && \ unzip -q signing.zip; exit 0 -RUN mv dxil-signing-0_1_2 signing +RUN mv dxil-signing-0_1_3 signing # Download and extract Linux and Windows binaries of AMD RGA WORKDIR /rga @@ -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" diff --git a/Makefile b/Makefile index fb2f66e..4a981ed 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NS = gwihlidal -VERSION ?= vk_rt3 +VERSION ?= vk_rt4 REPO = docker-shader NAME = docker-shader From 7253f6ddbf4cc845b80e5fe42fea3d2e5714f4d7 Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Mon, 18 Feb 2019 13:56:00 +0100 Subject: [PATCH 7/9] Final tweaks to signing tool install --- Dockerfile | 10 +++++----- Makefile | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d3806d1..65f1120 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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.3/dxil-signing-0_1_3.zip && \ +WORKDIR /signing +RUN wget -O signing.zip https://github.com/gwihlidal/dxil-signing/releases/download/0.1.3/dxil-signing-0_1_3.zip --no-check-certificate && \ unzip -q signing.zip; exit 0 -RUN mv dxil-signing-0_1_3 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.0.1/rga-linux-2.0.1.tgz --no-check-certificate && \ tar zxf rga_linux.tgz && \ mv rga-2.0.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.0.1/rga-windows-x64-2.0.1.zip --no-check-certificate && \ unzip -q rga_windows.zip; exit 0 RUN mv bin windows && \ # Remove GUI binaries diff --git a/Makefile b/Makefile index 4a981ed..5e2f827 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NS = gwihlidal -VERSION ?= vk_rt4 +VERSION ?= vk_rt5 REPO = docker-shader NAME = docker-shader From 4a6d5dcde9d441f2829b40a3c8470981a8e4fb5a Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Mon, 18 Feb 2019 19:45:21 +0100 Subject: [PATCH 8/9] Use latest wine branch --- Dockerfile | 8 ++++---- Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65f1120..12a109b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,9 +36,9 @@ ENV EFFCEE_BRANCH=master ENV EFFCEE_REPO=https://github.com/google/effcee.git 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 @@ -142,7 +142,7 @@ RUN wget -O vulkan.tgz https://sdk.lunarg.com/sdk/download/${VULKAN_SDK}/linux/v # Download and extract signing tool WORKDIR /signing -RUN wget -O signing.zip https://github.com/gwihlidal/dxil-signing/releases/download/0.1.3/dxil-signing-0_1_3.zip --no-check-certificate && \ +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 rm signing.zip diff --git a/Makefile b/Makefile index 5e2f827..bf8696a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NS = gwihlidal -VERSION ?= vk_rt5 +VERSION ?= vk_rt8 REPO = docker-shader NAME = docker-shader From 98552199494739b9563460ad86bb15905d1b60f3 Mon Sep 17 00:00:00 2001 From: Graham Wihlidal Date: Sun, 17 Mar 2019 10:51:36 -0700 Subject: [PATCH 9/9] Updated all version commit hashes (including going back to master DXC which now has NV_ray_tracing support) --- Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 12a109b..1912c2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,29 +4,29 @@ FROM ubuntu:bionic as builder -ENV DXC_BRANCH=NV_ray_tracing_final -ENV DXC_REPO=https://github.com/gwihlidal/DirectXShaderCompiler.git -ENV DXC_COMMIT=bf1bb935034b398396434a094a3d0650b34f3514 +ENV DXC_BRANCH=master +ENV DXC_REPO=https://github.com/Microsoft/DirectXShaderCompiler.git +ENV DXC_COMMIT=b2b9185ca5bd9fc58b272f2929131b4f4f4adb7d ENV SHADERC_BRANCH=master ENV SHADERC_REPO=https://github.com/google/shaderc.git -ENV SHADERC_COMMIT=419517b1595ffcf14c6098c3c1af09e7033e09df +ENV SHADERC_COMMIT=4b8446fc1703fc47330655869d8e68d264bb9ec4 ENV GOOGLE_TEST_BRANCH=master ENV GOOGLE_TEST_REPO=https://github.com/google/googletest.git -ENV GOOGLE_TEST_COMMIT=d850e144710e330070b756c009749dc7a7302301 +ENV GOOGLE_TEST_COMMIT=8b6d3f9c4a774bef3081195d422993323b6bb2e0 ENV GLSLANG_BRANCH=master -ENV GLSLANG_REPO=https://github.com/google/glslang.git -ENV GLSLANG_COMMIT=9983f99e87ab0b6608b236ea59bcf873f90e1435 +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=6d20f625702698dda6b5cda29dfadb9aa1f40092 +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=8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23 +ENV SPV_HEADERS_COMMIT=03a081524afabdde274d885880c2fef213e46a59 ENV RE2_BRANCH=master ENV RE2_REPO=https://github.com/google/re2.git @@ -44,7 +44,7 @@ ENV SMOLV_BRANCH=master ENV SMOLV_REPO=https://github.com/aras-p/smol-v.git ENV SMOLV_COMMIT=9a787d1354a9e43c9ea6027cd310ce2a2fd78901 -ENV VULKAN_SDK=1.1.97.0 +ENV VULKAN_SDK=1.1.101.0 # Prevents annoying debconf errors during builds ARG DEBIAN_FRONTEND="noninteractive" @@ -148,11 +148,11 @@ 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 --no-check-certificate && \ +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 --no-check-certificate && \ + 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