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
0e8c13e6
Commit
0e8c13e6
authored
Dec 04, 2007
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 07, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: A more detailed occlusion query test and fixes.
parent
54fa7129
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
175 additions
and
15 deletions
+175
-15
query.c
dlls/d3d9/tests/query.c
+112
-0
device.c
dlls/wined3d/device.c
+1
-0
query.c
dlls/wined3d/query.c
+52
-15
wined3d_private.h
dlls/wined3d/wined3d_private.h
+10
-0
No files found.
dlls/d3d9/tests/query.c
View file @
0e8c13e6
...
@@ -135,6 +135,117 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd)
...
@@ -135,6 +135,117 @@ static void test_query_support(IDirect3D9 *pD3d, HWND hwnd)
if
(
pDevice
)
IDirect3DDevice9_Release
(
pDevice
);
if
(
pDevice
)
IDirect3DDevice9_Release
(
pDevice
);
}
}
static
void
test_occlusion_query_states
(
IDirect3D9
*
pD3d
,
HWND
hwnd
)
{
HRESULT
hr
;
IDirect3DDevice9
*
pDevice
=
NULL
;
D3DPRESENT_PARAMETERS
d3dpp
;
D3DDISPLAYMODE
d3ddm
;
IDirect3DQuery9
*
pQuery
=
NULL
;
BYTE
*
data
=
NULL
;
float
point
[
3
]
=
{
0
.
0
,
0
.
0
,
0
.
0
};
unsigned
int
count
=
0
;
IDirect3D9_GetAdapterDisplayMode
(
pD3d
,
D3DADAPTER_DEFAULT
,
&
d3ddm
);
ZeroMemory
(
&
d3dpp
,
sizeof
(
d3dpp
)
);
d3dpp
.
Windowed
=
TRUE
;
d3dpp
.
SwapEffect
=
D3DSWAPEFFECT_DISCARD
;
d3dpp
.
BackBufferFormat
=
d3ddm
.
Format
;
hr
=
IDirect3D9_CreateDevice
(
pD3d
,
D3DADAPTER_DEFAULT
,
D3DDEVTYPE_HAL
,
hwnd
,
D3DCREATE_SOFTWARE_VERTEXPROCESSING
,
&
d3dpp
,
&
pDevice
);
ok
(
SUCCEEDED
(
hr
)
||
hr
==
D3DERR_NOTAVAILABLE
,
"Failed to create IDirect3D9Device (%s)
\n
"
,
DXGetErrorString9
(
hr
));
if
(
FAILED
(
hr
))
{
skip
(
"Failed to create a d3d device
\n
"
);
goto
cleanup
;
}
hr
=
IDirect3DDevice9_CreateQuery
(
pDevice
,
D3DQUERYTYPE_OCCLUSION
,
&
pQuery
);
ok
(
hr
==
D3D_OK
||
D3DERR_NOTAVAILABLE
,
"IDirect3DDevice9_CreateQuery returned unexpected return value %s
\n
"
,
DXGetErrorString9
(
hr
));
if
(
!
pQuery
)
{
skip
(
"Occlusion queries not supported
\n
"
);
goto
cleanup
;
}
data
=
HeapAlloc
(
GetProcessHeap
(),
0
,
IDirect3DQuery9_GetDataSize
(
pQuery
));
hr
=
IDirect3DQuery9_GetData
(
pQuery
,
NULL
,
0
,
D3DGETDATA_FLUSH
);
ok
(
hr
==
S_OK
,
"IDirect3DQuery9_GetData(NULL) on a new query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_GetData
(
pQuery
,
data
,
IDirect3DQuery9_GetDataSize
(
pQuery
),
D3DGETDATA_FLUSH
);
ok
(
hr
==
S_OK
,
"IDirect3DQuery9_GetData on a new query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_Issue
(
pQuery
,
D3DISSUE_END
);
ok
(
hr
==
D3D_OK
,
"IDirect3DQuery9_Issue(D3DISSUE_END) on a new not yet started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_Issue
(
pQuery
,
D3DISSUE_BEGIN
);
ok
(
hr
==
D3D_OK
,
"IDirect3DQuery9_Issue(D3DISSUE_BEGIN) on a new not yet started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_Issue
(
pQuery
,
D3DISSUE_BEGIN
);
ok
(
hr
==
D3D_OK
,
"IDirect3DQuery9_Issue(D3DQUERY_BEGIN) on a started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_GetData
(
pQuery
,
NULL
,
0
,
D3DGETDATA_FLUSH
);
ok
(
hr
==
S_FALSE
,
"IDirect3DQuery9_GetData(NULL) on a started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_GetData
(
pQuery
,
data
,
IDirect3DQuery9_GetDataSize
(
pQuery
),
D3DGETDATA_FLUSH
);
ok
(
hr
==
S_FALSE
,
"IDirect3DQuery9_GetData on a started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DDevice9_SetFVF
(
pDevice
,
D3DFVF_XYZ
);
ok
(
hr
==
D3D_OK
,
"IDirect3DDevice9_SetFVF returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DDevice9_BeginScene
(
pDevice
);
ok
(
hr
==
D3D_OK
,
"IDirect3DDevice9_BeginScene returned %s
\n
"
,
DXGetErrorString9
(
hr
));
if
(
SUCCEEDED
(
hr
))
{
hr
=
IDirect3DDevice9_DrawPrimitiveUP
(
pDevice
,
D3DPT_POINTLIST
,
1
,
point
,
3
*
sizeof
(
float
));
ok
(
hr
==
D3D_OK
,
"IDirect3DDevice9_DrawPrimitiveUP returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DDevice9_EndScene
(
pDevice
);
ok
(
hr
==
D3D_OK
,
"IDirect3DDevice9_EndScene returned %s
\n
"
,
DXGetErrorString9
(
hr
));
}
hr
=
IDirect3DQuery9_Issue
(
pQuery
,
D3DISSUE_END
);
ok
(
hr
==
D3D_OK
,
"IDirect3DQuery9_Issue(D3DISSUE_END) on a started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
S_FALSE
;
while
(
hr
==
S_FALSE
&&
count
<
500
)
{
hr
=
IDirect3DQuery9_GetData
(
pQuery
,
NULL
,
0
,
D3DGETDATA_FLUSH
);
ok
(
hr
==
S_OK
||
hr
==
S_FALSE
,
"IDirect3DQuery9_GetData on a ended query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
count
++
;
if
(
hr
==
S_FALSE
)
Sleep
(
10
);
}
ok
(
hr
==
S_OK
,
"Occlusion query did not finish
\n
"
);
hr
=
IDirect3DQuery9_GetData
(
pQuery
,
data
,
IDirect3DQuery9_GetDataSize
(
pQuery
),
D3DGETDATA_FLUSH
);
ok
(
hr
==
S_OK
,
"IDirect3DQuery9_GetData on a ended query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_GetData
(
pQuery
,
data
,
IDirect3DQuery9_GetDataSize
(
pQuery
),
D3DGETDATA_FLUSH
);
ok
(
hr
==
S_OK
,
"IDirect3DQuery9_GetData a 2nd time on a ended query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_Issue
(
pQuery
,
D3DISSUE_BEGIN
);
ok
(
hr
==
D3D_OK
,
"IDirect3DQuery9_Issue(D3DISSUE_BEGIN) on a new not yet started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_Issue
(
pQuery
,
D3DISSUE_END
);
ok
(
hr
==
D3D_OK
,
"IDirect3DQuery9_Issue(D3DISSUE_END) on a started query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
hr
=
IDirect3DQuery9_Issue
(
pQuery
,
D3DISSUE_END
);
ok
(
hr
==
D3D_OK
,
"IDirect3DQuery9_Issue(D3DISSUE_END) on a ended query returned %s
\n
"
,
DXGetErrorString9
(
hr
));
cleanup:
HeapFree
(
GetProcessHeap
(),
0
,
data
);
if
(
pDevice
)
IDirect3DDevice9_Release
(
pDevice
);
}
START_TEST
(
query
)
START_TEST
(
query
)
{
{
HMODULE
d3d9_handle
=
LoadLibraryA
(
"d3d9.dll"
);
HMODULE
d3d9_handle
=
LoadLibraryA
(
"d3d9.dll"
);
...
@@ -166,6 +277,7 @@ START_TEST(query)
...
@@ -166,6 +277,7 @@ START_TEST(query)
}
}
test_query_support
(
pD3d
,
hwnd
);
test_query_support
(
pD3d
,
hwnd
);
test_occlusion_query_states
(
pD3d
,
hwnd
);
DestroyWindow
(
hwnd
);
DestroyWindow
(
hwnd
);
IDirect3D9_Release
(
pD3d
);
IDirect3D9_Release
(
pD3d
);
...
...
dlls/wined3d/device.c
View file @
0e8c13e6
...
@@ -1259,6 +1259,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE
...
@@ -1259,6 +1259,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateQuery(IWineD3DDevice *iface, WINE
D3DCREATEOBJECTINSTANCE
(
object
,
Query
)
D3DCREATEOBJECTINSTANCE
(
object
,
Query
)
object
->
type
=
Type
;
object
->
type
=
Type
;
object
->
state
=
QUERY_CREATED
;
/* allocated the 'extended' data based on the type of query requested */
/* allocated the 'extended' data based on the type of query requested */
switch
(
Type
){
switch
(
Type
){
case
WINED3DQUERYTYPE_OCCLUSION
:
case
WINED3DQUERYTYPE_OCCLUSION
:
...
...
dlls/wined3d/query.c
View file @
0e8c13e6
This diff is collapsed.
Click to expand it.
dlls/wined3d/wined3d_private.h
View file @
0e8c13e6
...
@@ -1443,6 +1443,15 @@ extern void stateblock_copy(
...
@@ -1443,6 +1443,15 @@ extern void stateblock_copy(
extern
const
IWineD3DStateBlockVtbl
IWineD3DStateBlock_Vtbl
;
extern
const
IWineD3DStateBlockVtbl
IWineD3DStateBlock_Vtbl
;
/* Direct3D terminology with little modifications. We do not have an issued state
* because only the driver knows about it, but we have a created state because d3d
* allows GetData on a created issue, but opengl doesn't
*/
enum
query_state
{
QUERY_CREATED
,
QUERY_SIGNALLED
,
QUERY_BUILDING
};
/*****************************************************************************
/*****************************************************************************
* IWineD3DQueryImpl implementation structure (extends IUnknown)
* IWineD3DQueryImpl implementation structure (extends IUnknown)
*/
*/
...
@@ -1460,6 +1469,7 @@ typedef struct IWineD3DQueryImpl
...
@@ -1460,6 +1469,7 @@ typedef struct IWineD3DQueryImpl
#endif
#endif
/* IWineD3DQuery fields */
/* IWineD3DQuery fields */
enum
query_state
state
;
WINED3DQUERYTYPE
type
;
WINED3DQUERYTYPE
type
;
/* TODO: Think about using a IUnknown instead of a void* */
/* TODO: Think about using a IUnknown instead of a void* */
void
*
extendedData
;
void
*
extendedData
;
...
...
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