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
5815b639
Commit
5815b639
authored
Sep 14, 2010
by
Joris Huizer
Committed by
Alexandre Julliard
Sep 14, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9_36: D3DXPreprocessShaderFromFileW: remove unneeded code.
parent
a418f257
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
12 deletions
+1
-12
shader.c
dlls/d3dx9_36/shader.c
+1
-12
No files found.
dlls/d3dx9_36/shader.c
View file @
5815b639
...
...
@@ -548,10 +548,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
LPD3DXBUFFER
*
error_messages
)
{
void
*
buffer
;
DWORD
len
,
filename_len
;
DWORD
len
;
HRESULT
hr
;
struct
D3DXIncludeImpl
includefromfile
;
char
*
filename_a
;
if
(
FAILED
(
map_view_of_file
(
filename
,
&
buffer
,
&
len
)))
return
D3DXERR_INVALIDDATA
;
...
...
@@ -562,21 +561,11 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename,
include
=
(
LPD3DXINCLUDE
)
&
includefromfile
;
}
filename_len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
filename
,
-
1
,
NULL
,
0
,
NULL
,
NULL
);
filename_a
=
HeapAlloc
(
GetProcessHeap
(),
0
,
filename_len
*
sizeof
(
char
));
if
(
!
filename_a
)
{
UnmapViewOfFile
(
buffer
);
return
E_OUTOFMEMORY
;
}
WideCharToMultiByte
(
CP_ACP
,
0
,
filename
,
-
1
,
filename_a
,
filename_len
,
NULL
,
NULL
);
hr
=
D3DPreprocess
(
buffer
,
len
,
NULL
,
(
const
D3D_SHADER_MACRO
*
)
defines
,
(
ID3DInclude
*
)
include
,
(
ID3DBlob
**
)
shader
,
(
ID3DBlob
**
)
error_messages
);
HeapFree
(
GetProcessHeap
(),
0
,
filename_a
);
UnmapViewOfFile
(
buffer
);
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