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
75f005eb
Commit
75f005eb
authored
Sep 17, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 17, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Add a separate function for texture initialization.
parent
6c8636c3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
37 deletions
+52
-37
d3d9_private.h
dlls/d3d9/d3d9_private.h
+3
-3
device.c
dlls/d3d9/device.c
+32
-0
texture.c
dlls/d3d9/texture.c
+17
-34
No files found.
dlls/d3d9/d3d9_private.h
View file @
75f005eb
...
...
@@ -197,9 +197,6 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(IDirect3DDe
extern
HRESULT
WINAPI
IDirect3DDevice9Impl_GetSwapChain
(
IDirect3DDevice9Ex
*
iface
,
UINT
iSwapChain
,
IDirect3DSwapChain9
**
pSwapChain
)
DECLSPEC_HIDDEN
;
extern
UINT
WINAPI
IDirect3DDevice9Impl_GetNumberOfSwapChains
(
IDirect3DDevice9Ex
*
iface
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
IDirect3DDevice9Impl_CreateTexture
(
IDirect3DDevice9Ex
*
iface
,
UINT
Width
,
UINT
Height
,
UINT
Levels
,
DWORD
Usage
,
D3DFORMAT
Format
,
D3DPOOL
Pool
,
IDirect3DTexture9
**
ppTexture
,
HANDLE
*
pSharedHandle
)
DECLSPEC_HIDDEN
;
extern
HRESULT
WINAPI
IDirect3DDevice9Impl_CreateVertexBuffer
(
IDirect3DDevice9Ex
*
iface
,
UINT
Length
,
DWORD
Usage
,
DWORD
FVF
,
D3DPOOL
Pool
,
IDirect3DVertexBuffer9
**
ppVertexBuffer
,
HANDLE
*
pSharedHandle
)
DECLSPEC_HIDDEN
;
...
...
@@ -441,6 +438,9 @@ typedef struct IDirect3DTexture9Impl
LPDIRECT3DDEVICE9EX
parentDevice
;
}
IDirect3DTexture9Impl
;
HRESULT
texture_init
(
IDirect3DTexture9Impl
*
texture
,
IDirect3DDevice9Impl
*
device
,
UINT
width
,
UINT
height
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
DECLSPEC_HIDDEN
;
/* ----------------------- */
/* IDirect3DVolumeTexture9 */
/* ----------------------- */
...
...
dlls/d3d9/device.c
View file @
75f005eb
...
...
@@ -644,6 +644,38 @@ static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9EX iface,
wined3d_mutex_unlock
();
}
static
HRESULT
WINAPI
IDirect3DDevice9Impl_CreateTexture
(
IDirect3DDevice9Ex
*
iface
,
UINT
width
,
UINT
height
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
,
IDirect3DTexture9
**
texture
,
HANDLE
*
shared_handle
)
{
IDirect3DDevice9Impl
*
This
=
(
IDirect3DDevice9Impl
*
)
iface
;
IDirect3DTexture9Impl
*
object
;
HRESULT
hr
;
TRACE
(
"iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.
\n
"
,
iface
,
width
,
height
,
levels
,
usage
,
format
,
pool
,
texture
,
shared_handle
);
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
*
object
));
if
(
!
object
)
{
ERR
(
"Failed to allocate texture memory.
\n
"
);
return
D3DERR_OUTOFVIDEOMEMORY
;
}
hr
=
texture_init
(
object
,
This
,
width
,
height
,
levels
,
usage
,
format
,
pool
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to initialize texture, hr %#x.
\n
"
,
hr
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
return
hr
;
}
TRACE
(
"Created texture %p.
\n
"
,
object
);
*
texture
=
(
IDirect3DTexture9
*
)
object
;
return
D3D_OK
;
}
static
HRESULT
WINAPI
IDirect3DDevice9Impl_CreateVolumeTexture
(
IDirect3DDevice9Ex
*
iface
,
UINT
width
,
UINT
height
,
UINT
depth
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
,
IDirect3DVolumeTexture9
**
texture
,
HANDLE
*
shared_handle
)
...
...
dlls/d3d9/texture.c
View file @
75f005eb
...
...
@@ -350,43 +350,26 @@ static const IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl =
IDirect3DTexture9Impl_AddDirtyRect
};
HRESULT
texture_init
(
IDirect3DTexture9Impl
*
texture
,
IDirect3DDevice9Impl
*
device
,
UINT
width
,
UINT
height
,
UINT
levels
,
DWORD
usage
,
D3DFORMAT
format
,
D3DPOOL
pool
)
{
HRESULT
hr
;
/* IDirect3DDevice9 IDirect3DTexture9 Methods follow: */
HRESULT
WINAPI
IDirect3DDevice9Impl_CreateTexture
(
LPDIRECT3DDEVICE9EX
iface
,
UINT
Width
,
UINT
Height
,
UINT
Levels
,
DWORD
Usage
,
D3DFORMAT
Format
,
D3DPOOL
Pool
,
IDirect3DTexture9
**
ppTexture
,
HANDLE
*
pSharedHandle
)
{
IDirect3DTexture9Impl
*
object
;
IDirect3DDevice9Impl
*
This
=
(
IDirect3DDevice9Impl
*
)
iface
;
HRESULT
hrc
=
D3D_OK
;
TRACE
(
"(%p) : W(%d) H(%d), Lvl(%d) d(%d), Fmt(%#x), Pool(%d)
\n
"
,
This
,
Width
,
Height
,
Levels
,
Usage
,
Format
,
Pool
);
/* Allocate the storage for the device */
object
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
sizeof
(
IDirect3DTexture9Impl
));
if
(
NULL
==
object
)
{
ERR
(
"Allocation of memory failed, returning D3DERR_OUTOFVIDEOMEMORY
\n
"
);
return
D3DERR_OUTOFVIDEOMEMORY
;
}
object
->
lpVtbl
=
&
Direct3DTexture9_Vtbl
;
object
->
ref
=
1
;
texture
->
lpVtbl
=
&
Direct3DTexture9_Vtbl
;
texture
->
ref
=
1
;
wined3d_mutex_lock
();
hr
c
=
IWineD3DDevice_CreateTexture
(
This
->
WineD3DDevice
,
Width
,
Height
,
Levels
,
U
sage
&
WINED3DUSAGE_MASK
,
wined3dformat_from_d3dformat
(
Format
),
Pool
,
&
object
->
wineD3DTexture
,
(
IUnknown
*
)
object
);
hr
=
IWineD3DDevice_CreateTexture
(
device
->
WineD3DDevice
,
width
,
height
,
levels
,
u
sage
&
WINED3DUSAGE_MASK
,
wined3dformat_from_d3dformat
(
format
),
pool
,
&
texture
->
wineD3DTexture
,
(
IUnknown
*
)
texture
);
wined3d_mutex_unlock
();
if
(
FAILED
(
hrc
))
if
(
FAILED
(
hr
))
{
/* free up object */
WARN
(
"(%p) call to IWineD3DDevice_CreateTexture failed
\n
"
,
This
);
HeapFree
(
GetProcessHeap
(),
0
,
object
);
}
else
{
IDirect3DDevice9Ex_AddRef
(
iface
);
object
->
parentDevice
=
iface
;
*
ppTexture
=
(
LPDIRECT3DTEXTURE9
)
object
;
TRACE
(
"(%p) Created Texture %p, %p
\n
"
,
This
,
object
,
object
->
wineD3DTexture
);
}
return
hrc
;
WARN
(
"Failed to create wined3d texture, hr %#x.
\n
"
,
hr
);
return
hr
;
}
texture
->
parentDevice
=
(
IDirect3DDevice9Ex
*
)
device
;
IDirect3DDevice9Ex_AddRef
(
texture
->
parentDevice
);
return
D3D_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