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 654e960e340cc37a9282c52ba8aca5f779a13dbb.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-07-23 15:38:42 +02:00
parent 3f111101a8
commit 5989fb0938
7 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 5c8a708a60962f1495e22d13240f62b5ff6a2eea Mon Sep 17 00:00:00 2001
From 1295d2929164a855aee33f52350cf457f8028ff9 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,9 +7,9 @@ Subject: wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and
---
dlls/d3d10core/tests/device.c | 4 +--
dlls/d3d11/tests/d3d11.c | 4 +--
dlls/wined3d/query.c | 62 +++++++++++++++++++++++++++++++++++++++++++
dlls/wined3d/query.c | 60 +++++++++++++++++++++++++++++++++++++++++++
include/wine/wined3d.h | 6 +++++
4 files changed, 72 insertions(+), 4 deletions(-)
4 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 9b3a943..fb1ec06 100644
@@ -42,10 +42,10 @@ index df45eb5..4c65997 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, TRUE},
diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c
index 3168c30..d692054 100644
index 976cdd9..ef93d3b 100644
--- a/dlls/wined3d/query.c
+++ b/dlls/wined3d/query.c
@@ -676,6 +676,42 @@ static HRESULT wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *
@@ -682,6 +682,42 @@ static HRESULT wined3d_timestamp_disjoint_query_ops_issue(struct wined3d_query *
return WINED3D_OK;
}
@@ -88,7 +88,7 @@ index 3168c30..d692054 100644
static const struct wined3d_query_ops event_query_ops =
{
wined3d_event_query_ops_get_data,
@@ -750,6 +786,18 @@ static const struct wined3d_query_ops timestamp_disjoint_query_ops =
@@ -781,6 +817,18 @@ static const struct wined3d_query_ops timestamp_disjoint_query_ops =
wined3d_timestamp_disjoint_query_ops_issue,
};
@@ -107,7 +107,7 @@ index 3168c30..d692054 100644
static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *device,
enum wined3d_query_type type, void *parent)
{
@@ -759,6 +807,20 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de
@@ -790,6 +838,18 @@ static HRESULT query_init(struct wined3d_query *query, struct wined3d_device *de
switch (type)
{
@@ -115,19 +115,17 @@ index 3168c30..d692054 100644
+ FIXME("Statistics query.\n");
+ query->query_ops = &statistics_query_ops;
+ query->data_size = sizeof(struct wined3d_query_data_so_statistics);
+ query->extendedData = NULL;
+ break;
+
+ case WINED3D_QUERY_TYPE_SO_OVERFLOW:
+ FIXME("Overflow query.\n");
+ query->query_ops = &overflow_query_ops;
+ query->data_size = sizeof(BOOL);
+ query->extendedData = NULL;
+ break;
+
case WINED3D_QUERY_TYPE_TIMESTAMP:
TRACE("Timestamp query.\n");
if (!gl_info->supported[ARB_TIMER_QUERY])
case WINED3D_QUERY_TYPE_TIMESTAMP_DISJOINT:
case WINED3D_QUERY_TYPE_TIMESTAMP_FREQ:
TRACE("TIMESTAMP_DISJOINT query.\n");
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 36de1de..468ce98 100644
--- a/include/wine/wined3d.h