Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
dda9da79
Commit
dda9da79
authored
Feb 14, 2014
by
Matteo Bruni
Committed by
Alexandre Julliard
Feb 17, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Add some TRACEs and FIXMEs to D3DXCreateTextureFromFileInMemoryEx.
parent
cd22e8c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
texture.c
dlls/d3dx9_36/texture.c
+6
-4
No files found.
dlls/d3dx9_36/texture.c
View file @
dda9da79
...
...
@@ -534,9 +534,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
return
D3DERR_INVALIDCALL
;
hr
=
D3DXGetImageInfoFromFileInMemory
(
srcdata
,
srcdatasize
,
&
imginfo
);
if
(
FAILED
(
hr
))
{
FIXME
(
"Unrecognized file format, returning failure.
\n
"
);
*
texture
=
NULL
;
return
hr
;
}
...
...
@@ -583,9 +583,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
/* fix texture creation parameters */
hr
=
D3DXCheckTextureRequirements
(
device
,
&
width
,
&
height
,
&
miplevels
,
usage
,
&
format
,
pool
);
if
(
FAILED
(
hr
))
{
FIXME
(
"Couldn't find suitable texture parameters.
\n
"
);
*
texture
=
NULL
;
return
hr
;
}
...
...
@@ -622,11 +622,12 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
if
(
FAILED
(
hr
))
{
FIXME
(
"Texture creation failed.
\n
"
);
*
texture
=
NULL
;
return
hr
;
}
/* Load the file */
TRACE
(
"Texture created correctly. Now loading the texture data into it.
\n
"
);
if
(
imginfo
.
ImageFileFormat
!=
D3DXIFF_DDS
)
{
IDirect3DTexture9_GetSurfaceLevel
(
*
texptr
,
0
,
&
surface
);
...
...
@@ -640,6 +641,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
if
(
FAILED
(
hr
))
{
FIXME
(
"Texture loading failed.
\n
"
);
IDirect3DTexture9_Release
(
*
texptr
);
*
texture
=
NULL
;
return
hr
;
...
...
@@ -647,9 +649,9 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
loaded_miplevels
=
min
(
IDirect3DTexture9_GetLevelCount
(
*
texptr
),
imginfo
.
MipLevels
);
hr
=
D3DXFilterTexture
((
IDirect3DBaseTexture9
*
)
*
texptr
,
palette
,
loaded_miplevels
-
1
,
mipfilter
);
if
(
FAILED
(
hr
))
{
FIXME
(
"Texture filtering failed.
\n
"
);
IDirect3DTexture9_Release
(
*
texptr
);
*
texture
=
NULL
;
return
hr
;
...
...
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