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
1f6173a6
Commit
1f6173a6
authored
Sep 03, 2013
by
Matteo Bruni
Committed by
Alexandre Julliard
Sep 03, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Add / improve traces in some shader-related functions.
parent
3f221611
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
3 deletions
+35
-3
shader.c
dlls/d3dx9_36/shader.c
+35
-3
No files found.
dlls/d3dx9_36/shader.c
View file @
1f6173a6
...
...
@@ -311,6 +311,9 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(const WCHAR *filename, const D3DXMACR
HRESULT
hr
;
struct
D3DXIncludeImpl
includefromfile
;
TRACE
(
"filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.
\n
"
,
debugstr_w
(
filename
),
defines
,
include
,
flags
,
shader
,
error_messages
);
if
(
FAILED
(
map_view_of_file
(
filename
,
&
buffer
,
&
len
)))
return
D3DXERR_INVALIDDATA
;
...
...
@@ -334,6 +337,9 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceA(HMODULE module, const char *resou
HRSRC
res
;
DWORD
len
;
TRACE
(
"module %p, resource %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.
\n
"
,
module
,
debugstr_a
(
resource
),
defines
,
include
,
flags
,
shader
,
error_messages
);
if
(
!
(
res
=
FindResourceA
(
module
,
resource
,
(
const
char
*
)
RT_RCDATA
)))
return
D3DXERR_INVALIDDATA
;
if
(
FAILED
(
load_resource_into_memory
(
module
,
res
,
&
buffer
,
&
len
)))
...
...
@@ -366,8 +372,10 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO
{
HRESULT
hr
;
TRACE
(
"data %p, length %u, defines %p, include %p, function %s, profile %s, flags %#x, shader %p, error_msgs %p, constant_table %p
\n
"
,
data
,
length
,
defines
,
include
,
function
,
profile
,
flags
,
shader
,
error_msgs
,
constant_table
);
TRACE
(
"data %s, length %u, defines %p, include %p, function %s, profile %s, "
"flags %#x, shader %p, error_msgs %p, constant_table %p.
\n
"
,
debugstr_a
(
data
),
length
,
defines
,
include
,
debugstr_a
(
function
),
debugstr_a
(
profile
),
flags
,
shader
,
error_msgs
,
constant_table
);
hr
=
D3DCompile
(
data
,
length
,
NULL
,
(
D3D_SHADER_MACRO
*
)
defines
,
(
ID3DInclude
*
)
include
,
function
,
profile
,
flags
,
0
,
(
ID3DBlob
**
)
shader
,
(
ID3DBlob
**
)
error_msgs
);
...
...
@@ -423,6 +431,11 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO
struct
D3DXIncludeImpl
includefromfile
;
char
*
filename_a
;
TRACE
(
"filename %s, defines %p, include %p, entrypoint %s, profile %s, "
"flags %#x, shader %p, error_messages %p, constant_table %p.
\n
"
,
debugstr_w
(
filename
),
defines
,
include
,
debugstr_a
(
entrypoint
),
debugstr_a
(
profile
),
flags
,
shader
,
error_messages
,
constant_table
);
if
(
FAILED
(
map_view_of_file
(
filename
,
&
buffer
,
&
len
)))
return
D3DXERR_INVALIDDATA
;
...
...
@@ -462,6 +475,11 @@ HRESULT WINAPI D3DXCompileShaderFromResourceA(HMODULE module, const char *resour
HRSRC
res
;
DWORD
len
;
TRACE
(
"module %p, resource %s, defines %p, include %p, entrypoint %s, profile %s, "
"flags %#x, shader %p, error_messages %p, constant_table %p.
\n
"
,
module
,
debugstr_a
(
resource
),
defines
,
include
,
debugstr_a
(
entrypoint
),
debugstr_a
(
profile
),
flags
,
shader
,
error_messages
,
constant_table
);
if
(
!
(
res
=
FindResourceA
(
module
,
resource
,
(
const
char
*
)
RT_RCDATA
)))
return
D3DXERR_INVALIDDATA
;
if
(
FAILED
(
load_resource_into_memory
(
module
,
res
,
&
buffer
,
&
len
)))
...
...
@@ -494,7 +512,9 @@ HRESULT WINAPI D3DXCompileShaderFromResourceW(HMODULE module, const WCHAR *resou
HRESULT
WINAPI
D3DXPreprocessShader
(
const
char
*
data
,
UINT
data_len
,
const
D3DXMACRO
*
defines
,
ID3DXInclude
*
include
,
ID3DXBuffer
**
shader
,
ID3DXBuffer
**
error_messages
)
{
TRACE
(
"Forward to D3DPreprocess
\n
"
);
TRACE
(
"data %s, data_len %u, defines %p, include %p, shader %p, error_messages %p.
\n
"
,
debugstr_a
(
data
),
data_len
,
defines
,
include
,
shader
,
error_messages
);
return
D3DPreprocess
(
data
,
data_len
,
NULL
,
(
const
D3D_SHADER_MACRO
*
)
defines
,
(
ID3DInclude
*
)
include
,
(
ID3DBlob
**
)
shader
,
(
ID3DBlob
**
)
error_messages
);
...
...
@@ -507,6 +527,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileA(const char *filename, const D3DXMAC
DWORD
len
;
HRESULT
ret
;
TRACE
(
"filename %s, defines %p, include %p, shader %p, error_messages %p.
\n
"
,
debugstr_a
(
filename
),
defines
,
include
,
shader
,
error_messages
);
if
(
!
filename
)
return
D3DXERR_INVALIDDATA
;
len
=
MultiByteToWideChar
(
CP_ACP
,
0
,
filename
,
-
1
,
NULL
,
0
);
...
...
@@ -528,6 +551,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(const WCHAR *filename, const D3DXMA
HRESULT
hr
;
struct
D3DXIncludeImpl
includefromfile
;
TRACE
(
"filename %s, defines %p, include %p, shader %p, error_messages %p.
\n
"
,
debugstr_w
(
filename
),
defines
,
include
,
shader
,
error_messages
);
if
(
FAILED
(
map_view_of_file
(
filename
,
&
buffer
,
&
len
)))
return
D3DXERR_INVALIDDATA
;
...
...
@@ -553,6 +579,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceA(HMODULE module, const char *res
HRSRC
res
;
DWORD
len
;
TRACE
(
"module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.
\n
"
,
module
,
debugstr_a
(
resource
),
defines
,
include
,
shader
,
error_messages
);
if
(
!
(
res
=
FindResourceA
(
module
,
resource
,
(
const
char
*
)
RT_RCDATA
)))
return
D3DXERR_INVALIDDATA
;
if
(
FAILED
(
load_resource_into_memory
(
module
,
res
,
&
buffer
,
&
len
)))
...
...
@@ -568,6 +597,9 @@ HRESULT WINAPI D3DXPreprocessShaderFromResourceW(HMODULE module, const WCHAR *re
HRSRC
res
;
DWORD
len
;
TRACE
(
"module %p, resource %s, defines %p, include %p, shader %p, error_messages %p.
\n
"
,
module
,
debugstr_w
(
resource
),
defines
,
include
,
shader
,
error_messages
);
if
(
!
(
res
=
FindResourceW
(
module
,
resource
,
(
const
WCHAR
*
)
RT_RCDATA
)))
return
D3DXERR_INVALIDDATA
;
if
(
FAILED
(
load_resource_into_memory
(
module
,
res
,
&
buffer
,
&
len
)))
...
...
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