[vlc-devel] [PATCH 3.0] contrib: add d3d11 11.1 to 11.4 headers

[Steve Lhomme]

This is necessary to use ID3D11Fence on Windows 10.
---
 contrib/src/d3d11/SHA512SUMS |  4 ++++
 contrib/src/d3d11/rules.mak  | 42 ++++++++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/contrib/src/d3d11/SHA512SUMS b/contrib/src/d3d11/SHA512SUMS
index 96c760804c..d348b61f77 100644
--- a/contrib/src/d3d11/SHA512SUMS
+++ b/contrib/src/d3d11/SHA512SUMS
@@ -1,4 +1,8 @@
 0d97a004acd9d99d685aef6ae3c41b9951b41170d197173838ad2dbad4db309debcc2dd6ab2cfaa849ab9ca9841ae80232739b113b3e72c35ec8a481066acff5  d3d11.idl
+d309fc35b655213673ca2e79776a41088009cca845a7fe1968f0683093587de771039a3f2acd59f778e382ddb558309f728bbebbc4ffd1cfacc08bf57a223a89  d3d11_1.h
+9cd0805fb4ede1b6269455ac44f309b1f3e60a64c401e157f9866ce41427324c05717f3dc166aef12bd865ffca0c96696de8a9e4b549836a47c322aeae955f4e  d3d11_2.h
+5c9b2d3ca071d555f61d45c839b3a474a8e3a440cb386c65303f0e9c95da74565ac7bdc6430582bdd506c192fc259707f10fd2b111ca0374e487e6bbd5ffc3ee  d3d11_3.h
+f87eadc5c9a16a2e38d6a5615bd4e6d338df6a8b35879f315bcec39c876ebe9be47b0ce4174a5c259e6166895352a2403e503ae852218702fd7ed97b7aa3b142  d3d11_4.h
 04b208ddf9c91f923d262ae68a5fb0588a3ef1a39ea450eaac9031e021bd5efdc7b30e3fb3e589b07bc88e41f8861caeb56934a2fa6cbf2efb7404f5f3453b70  dxgidebug.idl
 1bee79fcaf5db6e53510f49fb40009fe6291ffafe47e1aea46ae0068afd001b405b0d970a55af63e475fbb18108e1ca0f91d86a18b6598b922c454ed082e8941  dxgi1_2.idl
 3f24632a71c96498f3432ed55ebdbe0a90e00c86ff88e4a41d1d04fdda14532aeff7799401803a03c6f69b3a07930d3f190211accef4ca199a21b3671acdcc45  dxgitype.h
diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index d2c1d9760e..41bde6528c 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -8,14 +8,24 @@ IDL_INCLUDES = -I/`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include
 endif
 
 D3D11_COMMIT_ID := a0cd5afeb60be3be0860e9a203314c10485bb9b8
+D3D11_1_COMMIT_ID := aa6ab47929a9cac6897f38e630ce0bb88458e288
+D3D11_4_COMMIT_ID := 6a1e782bb60bb1a93b5ab20fe895394d9c0904c2
 DXGI12_COMMIT_ID := 790a6544347b53c314b9c6f1ea757a2d5504c67e
 DXGITYPE_COMMIT_ID := f4aba520d014ecfe3563e33860de001caf2804e2
 D3D11_IDL_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11.idl?format=raw
+D3D11_1_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_1_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_1.h?format=raw
+D3D11_2_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_1_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_2.h?format=raw
+D3D11_3_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_1_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_3.h?format=raw
+D3D11_4_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(D3D11_4_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/d3d11_4.h?format=raw
 DXGI12_IDL_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGI12_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgi1_2.idl?format=raw
 DXGITYPE_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgitype.h?format=raw
 DXGIFORMAT_H_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgiformat.h?format=raw
 DXGI_IDL_URL := http://sourceforge.net/p/mingw-w64/mingw-w64/ci/$(DXGITYPE_COMMIT_ID)/tree/mingw-w64-headers/direct-x/include/dxgi.idl?format=raw
 DST_D3D11_H = $(PREFIX)/include/d3d11.h
+DST_D3D11_1_H = $(PREFIX)/include/d3d11_1.h
+DST_D3D11_2_H = $(PREFIX)/include/d3d11_2.h
+DST_D3D11_3_H = $(PREFIX)/include/d3d11_3.h
+DST_D3D11_4_H = $(PREFIX)/include/d3d11_4.h
 DST_DXGIDEBUG_H = $(PREFIX)/include/dxgidebug.h
 DST_DXGITYPE_H = $(PREFIX)/include/dxgitype.h
 DST_DXGIFORMAT_H = $(PREFIX)/include/dxgiformat.h
@@ -34,6 +44,18 @@ endif
 $(TARBALLS)/d3d11.idl:
 	$(call download_pkg,$(D3D11_IDL_URL),d3d11)
 
+$(TARBALLS)/d3d11_1.h:
+	$(call download_pkg,$(D3D11_1_H_URL),d3d11)
+
+$(TARBALLS)/d3d11_2.h:
+	$(call download_pkg,$(D3D11_2_H_URL),d3d11)
+
+$(TARBALLS)/d3d11_3.h:
+	$(call download_pkg,$(D3D11_3_H_URL),d3d11)
+
+$(TARBALLS)/d3d11_4.h:
+	$(call download_pkg,$(D3D11_4_H_URL),d3d11)
+
 $(TARBALLS)/dxgidebug.idl:
 	(cd $(TARBALLS) && patch -fp1) < $(SRC)/d3d11/dxgidebug.patch
 
@@ -49,7 +71,7 @@ $(TARBALLS)/dxgiformat.h:
 $(TARBALLS)/dxgi.idl:
 	$(call download_pkg,$(DXGI_IDL_URL),d3d11)
 
-.sum-d3d11: $(TARBALLS)/d3d11.idl $(TARBALLS)/dxgidebug.idl $(TARBALLS)/dxgi1_2.idl $(TARBALLS)/dxgitype.h $(TARBALLS)/dxgiformat.h $(TARBALLS)/dxgi.idl
+.sum-d3d11: $(TARBALLS)/d3d11.idl $(TARBALLS)/d3d11_1.h $(TARBALLS)/d3d11_2.h $(TARBALLS)/d3d11_3.h $(TARBALLS)/d3d11_4.h $(TARBALLS)/dxgidebug.idl $(TARBALLS)/dxgi1_2.idl $(TARBALLS)/dxgitype.h $(TARBALLS)/dxgiformat.h $(TARBALLS)/dxgi.idl
 
 d3d11: .sum-d3d11
 	mkdir -p $@
@@ -63,6 +85,22 @@ $(DST_D3D11_H): d3d11
 	mkdir -p -- "$(PREFIX)/include/"
 	$(WIDL) -DBOOL=WINBOOL -I$(PREFIX)/include $(IDL_INCLUDES) -h -o $@ $</d3d11.idl
 
+$(DST_D3D11_1_H): $(TARBALLS)/d3d11_1.h
+	mkdir -p -- "$(PREFIX)/include/"
+	cp $(TARBALLS)/d3d11_1.h $@
+
+$(DST_D3D11_2_H): $(TARBALLS)/d3d11_2.h
+	mkdir -p -- "$(PREFIX)/include/"
+	cp $(TARBALLS)/d3d11_2.h $@
+
+$(DST_D3D11_3_H): $(TARBALLS)/d3d11_3.h
+	mkdir -p -- "$(PREFIX)/include/"
+	cp $(TARBALLS)/d3d11_3.h $@
+
+$(DST_D3D11_4_H): $(TARBALLS)/d3d11_4.h
+	mkdir -p -- "$(PREFIX)/include/"
+	cp $(TARBALLS)/d3d11_4.h $@
+
 $(DST_DXGIDEBUG_H): $(TARBALLS)/dxgidebug.idl
 	mkdir -p -- "$(PREFIX)/include/"
 	$(WIDL) -DBOOL=WINBOOL -I$(PREFIX)/include $(IDL_INCLUDES) -h -o $@ $<
@@ -117,5 +155,5 @@ $(DST_DXGI16_H): $(SRC)/d3d11/dxgi1_6.idl $(DST_DXGI15_H)
 .dxgi16: .dxgi15 $(DST_DXGI16_H)
 	touch $@
 
-.d3d11: $(DST_D3D11_H) $(DST_DXGIDEBUG_H) .dxgi16
+.d3d11: $(DST_D3D11_H) $(DST_D3D11_1_H) $(DST_D3D11_2_H) $(DST_D3D11_3_H) $(DST_D3D11_4_H) $(DST_DXGIDEBUG_H) .dxgi16
 	touch $@
-- 
2.29.2