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
47fcc00c
Commit
47fcc00c
authored
Dec 15, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 16, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Pass an IWineD3DBaseTextureImpl pointer to basetexture_unload().
parent
7bc7caf4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
18 deletions
+16
-18
basetexture.c
dlls/wined3d/basetexture.c
+12
-14
cubetexture.c
dlls/wined3d/cubetexture.c
+1
-1
texture.c
dlls/wined3d/texture.c
+1
-1
volumetexture.c
dlls/wined3d/volumetexture.c
+1
-1
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/basetexture.c
View file @
47fcc00c
...
...
@@ -76,7 +76,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT layer_count, UIN
void
basetexture_cleanup
(
IWineD3DBaseTexture
*
iface
)
{
basetexture_unload
(
iface
);
basetexture_unload
(
(
IWineD3DBaseTextureImpl
*
)
iface
);
HeapFree
(
GetProcessHeap
(),
0
,
((
IWineD3DBaseTextureImpl
*
)
iface
)
->
baseTexture
.
sub_resources
);
resource_cleanup
((
IWineD3DResource
*
)
iface
);
}
...
...
@@ -103,30 +103,28 @@ static void gltexture_delete(struct gl_texture *tex)
tex
->
name
=
0
;
}
void
basetexture_unload
(
IWineD3DBaseTexture
*
ifac
e
)
void
basetexture_unload
(
IWineD3DBaseTexture
Impl
*
textur
e
)
{
IWineD3DTextureImpl
*
This
=
(
IWineD3DTextureImpl
*
)
iface
;
IWineD3DDeviceImpl
*
device
=
This
->
resource
.
device
;
IWineD3DDeviceImpl
*
device
=
texture
->
resource
.
device
;
struct
wined3d_context
*
context
=
NULL
;
if
(
This
->
baseTexture
.
texture_rgb
.
name
||
This
->
baseTexture
.
texture_srgb
.
name
)
if
(
texture
->
baseTexture
.
texture_rgb
.
name
||
texture
->
baseTexture
.
texture_srgb
.
name
)
{
context
=
context_acquire
(
device
,
NULL
);
}
if
(
This
->
baseTexture
.
texture_rgb
.
name
)
{
gltexture_delete
(
&
This
->
baseTexture
.
texture_rgb
);
}
if
(
This
->
baseTexture
.
texture_srgb
.
name
)
{
gltexture_delete
(
&
This
->
baseTexture
.
texture_srgb
);
}
if
(
texture
->
baseTexture
.
texture_rgb
.
name
)
gltexture_delete
(
&
texture
->
baseTexture
.
texture_rgb
);
if
(
texture
->
baseTexture
.
texture_srgb
.
name
)
gltexture_delete
(
&
texture
->
baseTexture
.
texture_srgb
);
if
(
context
)
context_release
(
context
);
This
->
baseTexture
.
texture_rgb
.
dirty
=
TRUE
;
This
->
baseTexture
.
texture_srgb
.
dirty
=
TRUE
;
texture
->
baseTexture
.
texture_rgb
.
dirty
=
TRUE
;
texture
->
baseTexture
.
texture_srgb
.
dirty
=
TRUE
;
resource_unload
((
IWineD3DResourceImpl
*
)
This
);
resource_unload
((
IWineD3DResourceImpl
*
)
texture
);
}
DWORD
basetexture_set_lod
(
IWineD3DBaseTexture
*
iface
,
DWORD
LODNew
)
...
...
dlls/wined3d/cubetexture.c
View file @
47fcc00c
...
...
@@ -229,7 +229,7 @@ static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface)
surface_set_texture_name
(
surface
,
0
,
FALSE
);
}
basetexture_unload
((
IWineD3DBaseTexture
*
)
iface
);
basetexture_unload
((
IWineD3DBaseTexture
Impl
*
)
This
);
}
static
WINED3DRESOURCETYPE
WINAPI
IWineD3DCubeTextureImpl_GetType
(
IWineD3DCubeTexture
*
iface
)
{
...
...
dlls/wined3d/texture.c
View file @
47fcc00c
...
...
@@ -220,7 +220,7 @@ static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) {
surface_set_texture_name
(
surface
,
0
,
TRUE
);
/* delete srgb name */
}
basetexture_unload
((
IWineD3DBaseTexture
*
)
iface
);
basetexture_unload
((
IWineD3DBaseTexture
Impl
*
)
This
);
}
static
WINED3DRESOURCETYPE
WINAPI
IWineD3DTextureImpl_GetType
(
IWineD3DTexture
*
iface
)
{
...
...
dlls/wined3d/volumetexture.c
View file @
47fcc00c
...
...
@@ -184,7 +184,7 @@ static void WINAPI IWineD3DVolumeTextureImpl_UnLoad(IWineD3DVolumeTexture *iface
IWineD3DVolume_UnLoad
((
IWineD3DVolume
*
)
This
->
baseTexture
.
sub_resources
[
i
]);
}
basetexture_unload
((
IWineD3DBaseTexture
*
)
iface
);
basetexture_unload
((
IWineD3DBaseTexture
Impl
*
)
This
);
}
static
WINED3DRESOURCETYPE
WINAPI
IWineD3DVolumeTextureImpl_GetType
(
IWineD3DVolumeTexture
*
iface
)
{
...
...
dlls/wined3d/wined3d_private.h
View file @
47fcc00c
...
...
@@ -1928,7 +1928,7 @@ HRESULT basetexture_set_autogen_filter_type(IWineD3DBaseTexture *iface,
WINED3DTEXTUREFILTERTYPE
filter_type
)
DECLSPEC_HIDDEN
;
BOOL
basetexture_set_dirty
(
IWineD3DBaseTextureImpl
*
texture
,
BOOL
dirty
)
DECLSPEC_HIDDEN
;
DWORD
basetexture_set_lod
(
IWineD3DBaseTexture
*
iface
,
DWORD
new_lod
)
DECLSPEC_HIDDEN
;
void
basetexture_unload
(
IWineD3DBaseTexture
*
ifac
e
)
DECLSPEC_HIDDEN
;
void
basetexture_unload
(
IWineD3DBaseTexture
Impl
*
textur
e
)
DECLSPEC_HIDDEN
;
/*****************************************************************************
* IWineD3DTexture implementation structure (extends IWineD3DBaseTextureImpl)
...
...
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