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
b5b05207
Commit
b5b05207
authored
Aug 28, 2012
by
Rico Schüller
Committed by
Alexandre Julliard
Aug 28, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Handle D3DXPC_VECTOR in set_matrix_array().
parent
a4dde815
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
shader.c
dlls/d3dx9_36/shader.c
+4
-1
shader.c
dlls/d3dx9_36/tests/shader.c
+1
-1
No files found.
dlls/d3dx9_36/shader.c
View file @
b5b05207
...
...
@@ -1177,6 +1177,7 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev
if
(
desc
->
Class
==
D3DXPC_MATRIX_ROWS
||
desc
->
Class
==
D3DXPC_MATRIX_COLUMNS
||
desc
->
Class
==
D3DXPC_VECTOR
||
desc
->
Class
==
D3DXPC_SCALAR
)
{
if
(
desc
->
Class
==
class
)
row_offset
=
4
;
...
...
@@ -1184,6 +1185,8 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev
if
(
class
==
D3DXPC_MATRIX_ROWS
)
{
if
(
desc
->
Class
==
D3DXPC_VECTOR
)
return
D3D_OK
;
num_rows
=
min
(
desc
->
Rows
,
rows
);
num_columns
=
min
(
desc
->
Columns
,
columns
);
}
...
...
@@ -1198,7 +1201,7 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev
else
{
FIXME
(
"Unhandled variable class %s
\n
"
,
debug_d3dxparameter_class
(
desc
->
Class
));
return
D3D_OK
;
return
E_NOTIMPL
;
}
switch
(
desc
->
RegisterSet
)
...
...
dlls/d3dx9_36/tests/shader.c
View file @
b5b05207
...
...
@@ -707,7 +707,7 @@ static void test_setting_basic_table(IDirect3DDevice9 *device)
ok
(
res
==
D3D_OK
,
"ID3DXConstantTable_SetMatrixTranspose failed on variable f4: 0x%08x
\n
"
,
res
);
IDirect3DDevice9_GetVertexShaderConstantF
(
device
,
7
,
out
,
1
);
todo_wine
ok
(
out
[
0
]
==
S
(
U
(
mvp
)).
_11
&&
out
[
1
]
==
S
(
U
(
mvp
)).
_21
&&
out
[
2
]
==
S
(
U
(
mvp
)).
_31
&&
out
[
3
]
==
S
(
U
(
mvp
)).
_41
,
ok
(
out
[
0
]
==
S
(
U
(
mvp
)).
_11
&&
out
[
1
]
==
S
(
U
(
mvp
)).
_21
&&
out
[
2
]
==
S
(
U
(
mvp
)).
_31
&&
out
[
3
]
==
S
(
U
(
mvp
)).
_41
,
"The variable f4 was not set correctly by ID3DXConstantTable_SetMatrixTranspose, "
"got {%f, %f, %f, %f}, should be {%f, %f, %f, %f}
\n
"
,
out
[
0
],
out
[
1
],
out
[
2
],
out
[
3
],
...
...
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