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 83e481fee20bc5c6598e65f8295be1b3f11fb70b

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-08-22 09:09:03 +10:00
parent 110a6f6016
commit 8cf0e5c285
11 changed files with 110 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,20 +1,20 @@
From 80ad1268188358c71be2e7320e3169a7df6995d9 Mon Sep 17 00:00:00 2001
From 1c3699443060f0ac1e780fddc38483831235026a 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
Subject: [PATCH] wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and
QUERY_TYPE_SO_OVERFLOW.
---
dlls/d3d10core/tests/device.c | 4 +-
dlls/d3d11/tests/d3d11.c | 4 +-
dlls/wined3d/query.c | 100 ++++++++++++++++++++++++++++++++++++++++++
dlls/d3d10core/tests/d3d10core.c | 4 +-
dlls/d3d11/tests/d3d11.c | 4 +-
dlls/wined3d/query.c | 100 +++++++++++++++++++++++++++++++
3 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 311ffeb82ba..9958feb1c25 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -3826,8 +3826,8 @@ static void test_create_query(void)
diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index 2100a6611e5..1d84cc8e269 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -4322,8 +4322,8 @@ static void test_create_query(void)
{D3D10_QUERY_TIMESTAMP_DISJOINT, FALSE, FALSE},
{D3D10_QUERY_PIPELINE_STATISTICS, FALSE, FALSE},
{D3D10_QUERY_OCCLUSION_PREDICATE, TRUE, FALSE},
@@ -26,10 +26,10 @@ index 311ffeb82ba..9958feb1c25 100644
ULONG refcount, expected_refcount;
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index a3f2c9879b4..28859f897bd 100644
index c499c8401e4..c688ad4f7e5 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -4600,8 +4600,8 @@ static void test_create_query(void)
@@ -5249,8 +5249,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, FALSE},
{D3D11_QUERY_OCCLUSION_PREDICATE, D3D_FEATURE_LEVEL_10_0, TRUE, TRUE, FALSE},
@@ -41,10 +41,10 @@ index a3f2c9879b4..28859f897bd 100644
{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, FALSE},
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 8445922423f..30b1d8d7a70 100644
index 01e6bcb9905..1eb35306b9a 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -860,6 +860,34 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD
@@ -920,6 +920,34 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD
return poll;
}
@@ -79,7 +79,7 @@ index 8445922423f..30b1d8d7a70 100644
static void wined3d_event_query_ops_destroy(struct wined3d_query *query)
{
struct wined3d_event_query *event_query = wined3d_event_query_from_query(query);
@@ -1143,6 +1171,72 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device,
@@ -1204,6 +1232,72 @@ static HRESULT wined3d_pipeline_query_create(struct wined3d_device *device,
return WINED3D_OK;
}
@@ -152,7 +152,7 @@ index 8445922423f..30b1d8d7a70 100644
HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_query_type type,
void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query)
{
@@ -1173,6 +1267,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q
@@ -1234,6 +1328,12 @@ HRESULT CDECL wined3d_query_create(struct wined3d_device *device, enum wined3d_q
case WINED3D_QUERY_TYPE_PIPELINE_STATISTICS:
return wined3d_pipeline_query_create(device, type, parent, parent_ops, query);
@@ -166,5 +166,5 @@ index 8445922423f..30b1d8d7a70 100644
FIXME("Unhandled query type %#x.\n", type);
return WINED3DERR_NOTAVAILABLE;
--
2.13.0
2.18.0