Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
d967973d
Commit
d967973d
authored
Jan 19, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 20, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Set the query.c GLINFO_LOCATION to *gl_info.
parent
ee1f2c46
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
query.c
dlls/wined3d/query.c
+10
-5
No files found.
dlls/wined3d/query.c
View file @
d967973d
...
...
@@ -31,7 +31,7 @@
*/
WINE_DEFAULT_DEBUG_CHANNEL
(
d3d
);
#define GLINFO_LOCATION
This->device->adapter->gl_info
#define GLINFO_LOCATION
(*gl_info)
/* *******************************************
IWineD3DQuery IUnknown parts follow
...
...
@@ -179,6 +179,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_GetData(IWineD3DQuery* iface,
static
HRESULT
WINAPI
IWineD3DEventQueryImpl_GetData
(
IWineD3DQuery
*
iface
,
void
*
pData
,
DWORD
dwSize
,
DWORD
dwGetDataFlags
)
{
IWineD3DQueryImpl
*
This
=
(
IWineD3DQueryImpl
*
)
iface
;
struct
wined3d_event_query
*
query
=
This
->
extendedData
;
const
struct
wined3d_gl_info
*
gl_info
;
struct
wined3d_context
*
context
;
BOOL
*
data
=
pData
;
...
...
@@ -204,15 +205,16 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_GetData(IWineD3DQuery* iface, void
}
context
=
context_acquire
(
This
->
device
,
query
->
context
->
current_rt
,
CTXUSAGE_RESOURCELOAD
);
gl_info
=
context
->
gl_info
;
ENTER_GL
();
if
(
context
->
gl_info
->
supported
[
APPLE_FENCE
])
if
(
gl_info
->
supported
[
APPLE_FENCE
])
{
*
data
=
GL_EXTCALL
(
glTestFenceAPPLE
(
query
->
id
));
checkGLcall
(
"glTestFenceAPPLE"
);
}
else
if
(
context
->
gl_info
->
supported
[
NV_FENCE
])
else
if
(
gl_info
->
supported
[
NV_FENCE
])
{
*
data
=
GL_EXTCALL
(
glTestFenceNV
(
query
->
id
));
checkGLcall
(
"glTestFenceNV"
);
...
...
@@ -255,6 +257,7 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD
if
(
dwIssueFlags
&
WINED3DISSUE_END
)
{
struct
wined3d_event_query
*
query
=
This
->
extendedData
;
const
struct
wined3d_gl_info
*
gl_info
;
struct
wined3d_context
*
context
;
if
(
query
->
context
)
...
...
@@ -276,14 +279,16 @@ static HRESULT WINAPI IWineD3DEventQueryImpl_Issue(IWineD3DQuery* iface, DWORD
context_alloc_event_query
(
context
,
query
);
}
gl_info
=
context
->
gl_info
;
ENTER_GL
();
if
(
context
->
gl_info
->
supported
[
APPLE_FENCE
])
if
(
gl_info
->
supported
[
APPLE_FENCE
])
{
GL_EXTCALL
(
glSetFenceAPPLE
(
query
->
id
));
checkGLcall
(
"glSetFenceAPPLE"
);
}
else
if
(
context
->
gl_info
->
supported
[
NV_FENCE
])
else
if
(
gl_info
->
supported
[
NV_FENCE
])
{
GL_EXTCALL
(
glSetFenceNV
(
query
->
id
,
GL_ALL_COMPLETED_NV
));
checkGLcall
(
"glSetFenceNV"
);
...
...
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