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
1fbdfd62
Commit
1fbdfd62
authored
Jun 07, 2011
by
Henri Verbeet
Committed by
Alexandre Julliard
Jun 07, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of wined3d_texture_get_type().
parent
1ae309f9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
11 deletions
+2
-11
device.c
dlls/wined3d/device.c
+2
-2
texture.c
dlls/wined3d/texture.c
+0
-7
wined3d.spec
dlls/wined3d/wined3d.spec
+0
-1
wined3d.h
include/wine/wined3d.h
+0
-1
No files found.
dlls/wined3d/device.c
View file @
1fbdfd62
...
...
@@ -4337,8 +4337,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device,
}
/* Verify that the source and destination textures are the same type. */
type
=
wined3d_texture_get_type
(
src_texture
)
;
if
(
wined3d_texture_get_type
(
dst_texture
)
!=
type
)
type
=
src_texture
->
resource
.
resourceType
;
if
(
dst_texture
->
resource
.
resourceType
!=
type
)
{
WARN
(
"Source and destination have different types, returning WINED3DERR_INVALIDCALL.
\n
"
);
return
WINED3DERR_INVALIDCALL
;
...
...
dlls/wined3d/texture.c
View file @
1fbdfd62
...
...
@@ -483,13 +483,6 @@ void CDECL wined3d_texture_preload(struct wined3d_texture *texture)
texture
->
texture_ops
->
texture_preload
(
texture
,
SRGB_ANY
);
}
WINED3DRESOURCETYPE
CDECL
wined3d_texture_get_type
(
const
struct
wined3d_texture
*
texture
)
{
TRACE
(
"texture %p.
\n
"
,
texture
);
return
texture
->
resource
.
resourceType
;
}
void
*
CDECL
wined3d_texture_get_parent
(
const
struct
wined3d_texture
*
texture
)
{
TRACE
(
"texture %p.
\n
"
,
texture
);
...
...
dlls/wined3d/wined3d.spec
View file @
1fbdfd62
...
...
@@ -268,7 +268,6 @@
@ cdecl wined3d_texture_get_priority(ptr)
@ cdecl wined3d_texture_get_private_data(ptr ptr ptr ptr)
@ cdecl wined3d_texture_get_sub_resource(ptr long)
@ cdecl wined3d_texture_get_type(ptr)
@ cdecl wined3d_texture_incref(ptr)
@ cdecl wined3d_texture_preload(ptr)
@ cdecl wined3d_texture_set_autogen_filter_type(ptr long)
...
...
include/wine/wined3d.h
View file @
1fbdfd62
...
...
@@ -2504,7 +2504,6 @@ HRESULT __cdecl wined3d_texture_get_private_data(const struct wined3d_texture *t
REFGUID
guid
,
void
*
data
,
DWORD
*
data_size
);
struct
wined3d_resource
*
__cdecl
wined3d_texture_get_sub_resource
(
struct
wined3d_texture
*
texture
,
UINT
sub_resource_idx
);
WINED3DRESOURCETYPE
__cdecl
wined3d_texture_get_type
(
const
struct
wined3d_texture
*
texture
);
ULONG
__cdecl
wined3d_texture_incref
(
struct
wined3d_texture
*
texture
);
void
__cdecl
wined3d_texture_preload
(
struct
wined3d_texture
*
texture
);
HRESULT
__cdecl
wined3d_texture_set_autogen_filter_type
(
struct
wined3d_texture
*
texture
,
...
...
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