Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
be2908ed
Commit
be2908ed
authored
Jul 22, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Jul 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of redundant ARB_timer_query checks.
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0b933f1f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
22 deletions
+13
-22
query.c
dlls/wined3d/query.c
+13
-22
No files found.
dlls/wined3d/query.c
View file @
be2908ed
...
...
@@ -588,38 +588,29 @@ static HRESULT wined3d_timestamp_query_ops_get_data(struct wined3d_query *query,
static
HRESULT
wined3d_timestamp_query_ops_issue
(
struct
wined3d_query
*
query
,
DWORD
flags
)
{
struct
wined3d_timestamp_query
*
tq
=
query
->
extendedData
;
struct
wined3d_device
*
device
=
query
->
device
;
const
struct
wined3d_gl_info
*
gl_info
=
&
device
->
adapter
->
gl_info
;
struct
wined3d_context
*
context
;
TRACE
(
"query %p, flags %#x.
\n
"
,
query
,
flags
);
if
(
gl_info
->
supported
[
ARB_TIMER_QUERY
]
)
if
(
flags
&
WINED3DISSUE_BEGIN
)
{
struct
wined3d_timestamp_query
*
tq
=
query
->
extendedData
;
struct
wined3d_context
*
context
;
if
(
flags
&
WINED3DISSUE_BEGIN
)
{
WARN
(
"Ignoring WINED3DISSUE_BEGIN with a TIMESTAMP query.
\n
"
);
}
if
(
flags
&
WINED3DISSUE_END
)
{
if
(
tq
->
context
)
context_free_timestamp_query
(
tq
);
context
=
context_acquire
(
query
->
device
,
NULL
);
context_alloc_timestamp_query
(
context
,
tq
);
GL_EXTCALL
(
glQueryCounter
(
tq
->
id
,
GL_TIMESTAMP
));
checkGLcall
(
"glQueryCounter()"
);
context_release
(
context
);
}
WARN
(
"Ignoring WINED3DISSUE_BEGIN with a TIMESTAMP query.
\n
"
);
}
else
if
(
flags
&
WINED3DISSUE_END
)
{
ERR
(
"Timestamp queries not supported.
\n
"
);
}
if
(
tq
->
context
)
context_free_timestamp_query
(
tq
);
context
=
context_acquire
(
query
->
device
,
NULL
);
context_alloc_timestamp_query
(
context
,
tq
);
GL_EXTCALL
(
glQueryCounter
(
tq
->
id
,
GL_TIMESTAMP
));
checkGLcall
(
"glQueryCounter()"
);
context_release
(
context
);
if
(
flags
&
WINED3DISSUE_END
)
query
->
state
=
QUERY_SIGNALLED
;
}
return
WINED3D_OK
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment