Ismail Dönmez 2017-01-14 20:48:02 +00:00 committed by Git OBS Bridge
parent 164f9910f1
commit ab1b832e65
4 changed files with 200 additions and 5 deletions

View File

@ -0,0 +1,193 @@
From cd61f9067b342c8fcf418d724dff4bccbebfaa78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 12 Jan 2017 08:46:53 +0100
Subject: [PATCH] Add missing D3D_CS_* variables.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: İsmail Dönmez <ismail@i10z.com>
---
mingw-w64-headers/direct-x/include/d3d11.h | 102 +++++++++++++++++++++++++++
mingw-w64-headers/direct-x/include/d3d11.idl | 52 ++++++++++++++
2 files changed, 154 insertions(+)
diff --git a/mingw-w64-headers/direct-x/include/d3d11.h b/mingw-w64-headers/direct-x/include/d3d11.h
index 52610b96..68ce51b1 100644
--- a/mingw-w64-headers/direct-x/include/d3d11.h
+++ b/mingw-w64-headers/direct-x/include/d3d11.h
@@ -327,6 +327,108 @@ typedef interface ID3D11VideoProcessorInputView ID3D11VideoProcessorInputView;
#define D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE (7)
+#define D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (256)
+
+#define D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP (64)
+
+#define D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (240)
+
+#define D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP (68)
+
+#define D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (224)
+
+#define D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP (72)
+
+#define D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (208)
+
+#define D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP (76)
+
+#define D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (192)
+
+#define D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP (84)
+
+#define D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (176)
+
+#define D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP (92)
+
+#define D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (160)
+
+#define D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP (100)
+
+#define D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (144)
+
+#define D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP (112)
+
+#define D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (128)
+
+#define D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP (128)
+
+#define D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (112)
+
+#define D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP (144)
+
+#define D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (96)
+
+#define D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP (168)
+
+#define D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (80)
+
+#define D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP (204)
+
+#define D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (64)
+
+#define D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP (256)
+
+#define D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (48)
+
+#define D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP (340)
+
+#define D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (32)
+
+#define D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP (512)
+
+#define D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD (16)
+
+#define D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP (768)
+
+#define D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION (1)
+
+#define D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT (256)
+
+#define D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP (768)
+
+#define D3D11_CS_4_X_THREAD_GROUP_MAX_X (768)
+
+#define D3D11_CS_4_X_THREAD_GROUP_MAX_Y (768)
+
+#define D3D11_CS_4_X_UAV_REGISTER_COUNT (1)
+
+#define D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION (65535)
+
+#define D3D11_CS_TGSM_REGISTER_COUNT (8192)
+
+#define D3D11_CS_TGSM_REGISTER_READS_PER_INST (1)
+
+#define D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS (1)
+
+#define D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS (1)
+
+#define D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP (1024)
+
+#define D3D11_CS_THREAD_GROUP_MAX_X (1024)
+
+#define D3D11_CS_THREAD_GROUP_MAX_Y (1024)
+
+#define D3D11_CS_THREAD_GROUP_MAX_Z (64)
+
+#define D3D11_CS_THREAD_GROUP_MIN_X (1)
+
+#define D3D11_CS_THREAD_GROUP_MIN_Y (1)
+
+#define D3D11_CS_THREAD_GROUP_MIN_Z (1)
+
+#define D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL (16384)
+
#define D3D11_DEFAULT_DEPTH_BIAS (0)
#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f
diff --git a/mingw-w64-headers/direct-x/include/d3d11.idl b/mingw-w64-headers/direct-x/include/d3d11.idl
index 3c39f041..68d6c717 100644
--- a/mingw-w64-headers/direct-x/include/d3d11.idl
+++ b/mingw-w64-headers/direct-x/include/d3d11.idl
@@ -68,6 +68,58 @@ const INT D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN = -10;
const INT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE = -8;
const UINT D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE = 7;
+const UINT D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 256;
+const UINT D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP = 64;
+const UINT D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 240;
+const UINT D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP = 68;
+const UINT D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 224;
+const UINT D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP = 72;
+const UINT D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 208;
+const UINT D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP = 76;
+const UINT D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 192;
+const UINT D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP = 84;
+const UINT D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 176;
+const UINT D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP = 92;
+const UINT D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 160;
+const UINT D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP = 100;
+const UINT D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 144;
+const UINT D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP = 112;
+const UINT D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 128;
+const UINT D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP = 128;
+const UINT D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 112;
+const UINT D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP = 144;
+const UINT D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 96;
+const UINT D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP = 168;
+const UINT D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 80;
+const UINT D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP = 204;
+const UINT D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 64;
+const UINT D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP = 256;
+const UINT D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 48;
+const UINT D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP = 340;
+const UINT D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 32;
+const UINT D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP = 512;
+const UINT D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD = 16;
+const UINT D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP = 768;
+const UINT D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION = 1;
+const UINT D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT = 256;
+const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP = 768;
+const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_X = 768;
+const UINT D3D11_CS_4_X_THREAD_GROUP_MAX_Y = 768;
+const UINT D3D11_CS_4_X_UAV_REGISTER_COUNT = 1;
+const UINT D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION = 65535;
+const UINT D3D11_CS_TGSM_REGISTER_COUNT = 8192;
+const UINT D3D11_CS_TGSM_REGISTER_READS_PER_INST = 1;
+const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS = 1;
+const UINT D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS = 1;
+const UINT D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP = 1024;
+const UINT D3D11_CS_THREAD_GROUP_MAX_X = 1024;
+const UINT D3D11_CS_THREAD_GROUP_MAX_Y = 1024;
+const UINT D3D11_CS_THREAD_GROUP_MAX_Z = 64;
+const UINT D3D11_CS_THREAD_GROUP_MIN_X = 1;
+const UINT D3D11_CS_THREAD_GROUP_MIN_Y = 1;
+const UINT D3D11_CS_THREAD_GROUP_MIN_Z = 1;
+const UINT D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL = 16384;
+
const UINT D3D11_DEFAULT_DEPTH_BIAS = 0;
cpp_quote("#define D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0f")
const UINT D3D11_DEFAULT_MAX_ANISOTROPY = 16;
--
2.11.0

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:75d9a674210811261423aae0c158d613df8c767d2db3a0eeded5d631726978d0
size 5244552

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0ecb6d759e7039232dcdee04d38ad772b42aca940dc5ed9ddde7bedfbf3c0957
size 5242436

View File

@ -17,7 +17,7 @@
Name: mingw32-headers Name: mingw32-headers
Version: 5.0~rc2 Version: 5.0.1
Release: 0 Release: 0
Summary: MinGW-w64 headers for Win32 and Win64 Summary: MinGW-w64 headers for Win32 and Win64
License: SUSE-Public-Domain License: SUSE-Public-Domain
@ -26,7 +26,8 @@ Url: http://mingw-w64.sf.net/
#DL-URL: http://downloads.sf.net/mingw-w64/mingw-w64-v5.0-rc1.tar.bz2 #DL-URL: http://downloads.sf.net/mingw-w64/mingw-w64-v5.0-rc1.tar.bz2
Source: mingw-w64-headers-%version.tar.xz Source: mingw-w64-headers-%version.tar.xz
Source9: %name-rpmlintrc Source100: %name-rpmlintrc
Patch1: 0001-Add-missing-D3D_CS_-variables.patch
BuildRequires: mingw32-filesystem BuildRequires: mingw32-filesystem
BuildRequires: xz BuildRequires: xz
#!BuildIgnore: post-build-checks #!BuildIgnore: post-build-checks
@ -53,6 +54,7 @@ an actual pthread implementation (like winpthreads) is installed.
%prep %prep
%setup -q -n mingw-w64-headers %setup -q -n mingw-w64-headers
%patch1 -p2
%build %build
%{_mingw32_configure} \ %{_mingw32_configure} \