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
b999ab16
Commit
b999ab16
authored
Sep 04, 2012
by
Rico Schüller
Committed by
Alexandre Julliard
Sep 04, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Fix ID3DXConstantTable::GetConstantElement() for structs.
parent
c5a72379
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
shader.c
dlls/d3dx9_36/shader.c
+1
-1
shader.c
dlls/d3dx9_36/tests/shader.c
+6
-0
No files found.
dlls/d3dx9_36/shader.c
View file @
b999ab16
...
@@ -1009,7 +1009,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant
...
@@ -1009,7 +1009,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstant
if
(
c
&&
index
<
c
->
desc
.
Elements
)
if
(
c
&&
index
<
c
->
desc
.
Elements
)
{
{
if
(
c
->
constants
)
c
=
&
c
->
constants
[
index
];
if
(
c
->
desc
.
Elements
>
1
)
c
=
&
c
->
constants
[
index
];
TRACE
(
"Returning constant %p
\n
"
,
c
);
TRACE
(
"Returning constant %p
\n
"
,
c
);
return
handle_from_constant
(
c
);
return
handle_from_constant
(
c
);
}
}
...
...
dlls/d3dx9_36/tests/shader.c
View file @
b999ab16
...
@@ -1848,6 +1848,12 @@ static void test_get_shader_constant_variables(void)
...
@@ -1848,6 +1848,12 @@ static void test_get_shader_constant_variables(void)
element
=
ID3DXConstantTable_GetConstantByName
(
ctable
,
"s_2[0]"
,
"invalid"
);
element
=
ID3DXConstantTable_GetConstantByName
(
ctable
,
"s_2[0]"
,
"invalid"
);
ok
(
element
==
NULL
,
"GetConstantByName failed
\n
"
);
ok
(
element
==
NULL
,
"GetConstantByName failed
\n
"
);
constant
=
ID3DXConstantTable_GetConstantByName
(
ctable
,
NULL
,
"s_2[0]"
);
ok
(
constant
!=
NULL
,
"GetConstantByName failed
\n
"
);
element
=
ID3DXConstantTable_GetConstantElement
(
ctable
,
"s_2[0]"
,
0
);
ok
(
constant
==
element
,
"GetConstantByName failed, got %p, expected %p
\n
"
,
element
,
constant
);
count
=
ID3DXConstantTable_Release
(
ctable
);
count
=
ID3DXConstantTable_Release
(
ctable
);
ok
(
count
==
0
,
"Release failed, got %u, expected %u
\n
"
,
count
,
0
);
ok
(
count
==
0
,
"Release failed, got %u, expected %u
\n
"
,
count
,
0
);
}
}
...
...
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