Rebase against aaf9c833ee1b9dca8cffcb2a60c96093fdd36405

This commit is contained in:
Alistair Leslie-Hughes
2019-05-11 11:12:22 +10:00
parent 082a898ad4
commit 1308207a63
4 changed files with 10 additions and 85 deletions

View File

@@ -1,26 +1,26 @@
From c1554852648aa2a0f2629db4424604e9b6de5414 Mon Sep 17 00:00:00 2001
From 4f9c93a7a074b6adac59c53b20e52185ab04b121 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 23 Apr 2019 12:02:06 +1000
Subject: [PATCH 1/2] include: Add missing D3DKMT typedefs
Subject: [PATCH] include: Add missing D3DKMT typedefs
---
include/ddk/d3dkmthk.h | 437 +++++++++++++++++++++++++++++++++++++++++++++++++
include/ddk/d3dkmthk.h | 437 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 437 insertions(+)
diff --git a/include/ddk/d3dkmthk.h b/include/ddk/d3dkmthk.h
index 0000b2f..ab2af52 100644
index c87321058ca..fae18baed9a 100644
--- a/include/ddk/d3dkmthk.h
+++ b/include/ddk/d3dkmthk.h
@@ -21,6 +21,8 @@
#include <d3dukmdt.h>
@@ -136,6 +136,8 @@ typedef struct _D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP
D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;
} D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP;
+#define D3DKMT_QUERYSTATISTICS_SEGMENT_PREFERENCE_MAX 5
+
typedef struct _D3DKMT_CLOSEADAPTER
{
D3DKMT_HANDLE hAdapter;
@@ -45,6 +47,441 @@ typedef struct _D3DKMT_DESTROYDCFROMMEMORY
@@ -160,6 +162,441 @@ typedef struct _D3DKMT_DESTROYDCFROMMEMORY
HANDLE hBitmap;
} D3DKMT_DESTROYDCFROMMEMORY;
@@ -463,5 +463,5 @@ index 0000b2f..ab2af52 100644
extern "C"
{
--
1.9.1
2.20.1