Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
82adae94
Commit
82adae94
authored
12 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
d3d9: Get rid of IDirect3D9Impl.
parent
5b2d1710
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dlls/d3d9/d3d9_main.c
+2
-2
2 additions, 2 deletions
dlls/d3d9/d3d9_main.c
dlls/d3d9/d3d9_private.h
+11
-17
11 additions, 17 deletions
dlls/d3d9/d3d9_private.h
dlls/d3d9/device.c
+1
-1
1 addition, 1 deletion
dlls/d3d9/device.c
dlls/d3d9/directx.c
+162
-173
162 additions, 173 deletions
dlls/d3d9/directx.c
with
176 additions
and
193 deletions
dlls/d3d9/d3d9_main.c
+
2
−
2
View file @
82adae94
...
...
@@ -35,7 +35,7 @@ void WINAPI DebugSetMute(void) {
IDirect3D9
*
WINAPI
DECLSPEC_HOTPATCH
Direct3DCreate9
(
UINT
sdk_version
)
{
IDirect3D9Impl
*
object
;
struct
d3d9
*
object
;
TRACE
(
"sdk_version %#x.
\n
"
,
sdk_version
);
...
...
@@ -59,7 +59,7 @@ IDirect3D9 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT sdk_version)
HRESULT
WINAPI
DECLSPEC_HOTPATCH
Direct3DCreate9Ex
(
UINT
sdk_version
,
IDirect3D9Ex
**
d3d9ex
)
{
IDirect3D9Impl
*
object
;
struct
d3d9
*
object
;
TRACE
(
"sdk_version %#x, d3d9ex %p.
\n
"
,
sdk_version
,
d3d9ex
);
...
...
This diff is collapsed.
Click to expand it.
dlls/d3d9/d3d9_private.h
+
11
−
17
View file @
82adae94
...
...
@@ -127,22 +127,15 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H
_pD3D9Caps->MaxVertexShader30InstructionSlots = _pWineCaps->MaxVertexShader30InstructionSlots; \
_pD3D9Caps->MaxPixelShader30InstructionSlots = _pWineCaps->MaxPixelShader30InstructionSlots;
/*****************************************************************************
* IDirect3D implementation structure
*/
typedef
struct
IDirect3D9Impl
struct
d3d9
{
/* IUnknown fields */
IDirect3D9Ex
IDirect3D9Ex_iface
;
LONG
ref
;
struct
wined3d
*
WineD3D
;
/* Created via Direct3DCreate9Ex? Can QI extended interfaces */
BOOL
extended
;
}
IDirect3D9Impl
;
IDirect3D9Ex
IDirect3D9Ex_iface
;
LONG
refcount
;
struct
wined3d
*
wined3d
;
BOOL
extended
;
};
BOOL
d3d9_init
(
IDirect3D9Impl
*
d3d9
,
BOOL
extended
)
DECLSPEC_HIDDEN
;
BOOL
d3d9_init
(
struct
d3d9
*
d3d9
,
BOOL
extended
)
DECLSPEC_HIDDEN
;
void
filter_caps
(
D3DCAPS9
*
pCaps
)
DECLSPEC_HIDDEN
;
struct
fvf_declaration
...
...
@@ -160,7 +153,7 @@ typedef struct IDirect3DDevice9Impl
struct
wined3d_device_parent
device_parent
;
LONG
ref
;
struct
wined3d_device
*
wined3d_device
;
struct
IDirect3D9Impl
*
d3d_parent
;
struct
d3d9
*
d3d_parent
;
/* Avoids recursion with nested ReleaseRef to 0 */
BOOL
inDestruction
;
...
...
@@ -171,8 +164,9 @@ typedef struct IDirect3DDevice9Impl
BOOL
in_scene
;
}
IDirect3DDevice9Impl
;
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
IDirect3D9Impl
*
parent
,
struct
wined3d
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
)
DECLSPEC_HIDDEN
;
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
struct
d3d9
*
parent
,
struct
wined3d
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
)
DECLSPEC_HIDDEN
;
/*****************************************************************************
* IDirect3DVolume9 implementation structure
...
...
This diff is collapsed.
Click to expand it.
dlls/d3d9/device.c
+
1
−
1
View file @
82adae94
...
...
@@ -3380,7 +3380,7 @@ static void setup_fpu(void)
#endif
}
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
IDirect3D9Impl
*
parent
,
struct
wined3d
*
wined3d
,
HRESULT
device_init
(
IDirect3DDevice9Impl
*
device
,
struct
d3d9
*
parent
,
struct
wined3d
*
wined3d
,
UINT
adapter
,
D3DDEVTYPE
device_type
,
HWND
focus_window
,
DWORD
flags
,
D3DPRESENT_PARAMETERS
*
parameters
,
D3DDISPLAYMODEEX
*
mode
)
{
...
...
This diff is collapsed.
Click to expand it.
dlls/d3d9/directx.c
+
162
−
173
View file @
82adae94
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment