wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ef267f115f76a3041e0da4a0f0dbd7ffb4a022e1.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-05-25 01:19:21 +02:00
parent 8b1d3d07ab
commit 91f6a8ad80
7 changed files with 48 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
patches/wined3d-QUERY_Stubs/0001-wined3d-Add-stubs-for-QUERY_TYPE_SO_STATISTICS-and-Q.patch
View File

@@ -1,4 +1,4 @@
From fa278e34bc45e98c041fa3ae2a9c003efa0667bb Mon Sep 17 00:00:00 2001
From 9083e580904536e28ba4cfb3adb65bd24a94ed9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 16 Apr 2016 18:18:54 +0200
Subject: wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and
@@ -7,15 +7,16 @@ Subject: wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and
---
dlls/d3d10core/tests/device.c | 4 +-
dlls/d3d11/tests/d3d11.c | 4 +-
dlls/d3d9/device.c | 3 ++
dlls/wined3d/query.c | 96 +++++++++++++++++++++++++++++++++++++++++++
include/wine/wined3d.h | 6 +++
4 files changed, 106 insertions(+), 4 deletions(-)
5 files changed, 109 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index e4ab7a4dfb..c1b74718b5 100644
index 6abc79a7a44..a68baa6d0ff 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -3869,8 +3869,8 @@ static void test_create_query(void)
@@ -3808,8 +3808,8 @@ static void test_create_query(void)
{D3D10_QUERY_TIMESTAMP_DISJOINT, FALSE, FALSE},
{D3D10_QUERY_PIPELINE_STATISTICS, FALSE, TRUE},
{D3D10_QUERY_OCCLUSION_PREDICATE, TRUE, FALSE},
@@ -27,10 +28,10 @@ index e4ab7a4dfb..c1b74718b5 100644
ULONG refcount, expected_refcount;
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 6626ea2065..ee38b26e00 100644
index 91d5927acb1..d409c8beeaa 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -4588,8 +4588,8 @@ static void test_create_query(void)
@@ -4583,8 +4583,8 @@ static void test_create_query(void)
{D3D11_QUERY_TIMESTAMP_DISJOINT, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, FALSE},
{D3D11_QUERY_PIPELINE_STATISTICS, D3D_FEATURE_LEVEL_10_0, FALSE, FALSE, TRUE},
{D3D11_QUERY_OCCLUSION_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, FALSE},
@@ -41,8 +42,22 @@ index 6626ea2065..ee38b26e00 100644
{D3D11_QUERY_SO_STATISTICS_STREAM0, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE},
{D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0, D3D_FEATURE_LEVEL_11_0, TRUE, FALSE, TRUE},
{D3D11_QUERY_SO_STATISTICS_STREAM1, D3D_FEATURE_LEVEL_11_0, FALSE, FALSE, TRUE},
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index b4cb25316c7..74273926ae6 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3445,6 +3445,9 @@ static HRESULT WINAPI d3d9_device_CreateQuery(IDirect3DDevice9Ex *iface, D3DQUER
TRACE("iface %p, type %#x, query %p.\n", iface, type, query);
+ if (type < D3DQUERYTYPE_VCACHE || type > D3DQUERYTYPE_MEMORYPRESSURE)
+ return D3DERR_NOTAVAILABLE;
+
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)
return E_OUTOFMEMORY;
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 3cfbd8431a..2bca60e7d4 100644
index 3cfbd8431ac..2bca60e7d4c 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -294,6 +294,14 @@ static void wined3d_query_destroy_object(void *object)
@@ -170,10 +185,10 @@ index 3cfbd8431a..2bca60e7d4 100644
FIXME("Unhandled query type %#x.\n", type);
return WINED3DERR_NOTAVAILABLE;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 4c0f47dc33..993797d877 100644
index 97947e44d9c..fc1a5fea56d 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -709,6 +709,12 @@ struct wined3d_query_data_timestamp_disjoint
@@ -710,6 +710,12 @@ struct wined3d_query_data_timestamp_disjoint
BOOL disjoint;
};