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
fbba7434
Commit
fbba7434
authored
Aug 16, 2012
by
Józef Kucia
Committed by
Alexandre Julliard
Aug 16, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Implement ID3DXConstantTable::SetBoolArray.
parent
d2bbbc71
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
shader.c
dlls/d3dx9_36/shader.c
+2
-2
shader.c
dlls/d3dx9_36/tests/shader.c
+11
-0
No files found.
dlls/d3dx9_36/shader.c
View file @
fbba7434
...
...
@@ -953,9 +953,9 @@ static HRESULT WINAPI ID3DXConstantTableImpl_SetBoolArray(ID3DXConstantTable *if
{
struct
ID3DXConstantTableImpl
*
This
=
impl_from_ID3DXConstantTable
(
iface
);
FIXME
(
"(%p)->(%p, %p, %p, %d): stub
\n
"
,
This
,
device
,
constant
,
b
,
count
);
TRACE
(
"(%p)->(%p, %p, %p, %d)
\n
"
,
This
,
device
,
constant
,
b
,
count
);
return
E_NOTIMPL
;
return
set_scalar_array
(
iface
,
device
,
constant
,
b
,
count
,
D3DXPT_BOOL
)
;
}
static
HRESULT
WINAPI
ID3DXConstantTableImpl_SetInt
(
ID3DXConstantTable
*
iface
,
LPDIRECT3DDEVICE9
device
,
D3DXHANDLE
constant
,
INT
n
)
...
...
dlls/d3dx9_36/tests/shader.c
View file @
fbba7434
...
...
@@ -621,6 +621,7 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device)
static
const
D3DXVECTOR4
fvecarray
[
2
]
=
{
{
0
.
745
f
,
0
.
997
f
,
0
.
353
f
,
0
.
237
f
},
{
0
.
060
f
,
0
.
455
f
,
0
.
333
f
,
0
.
983
f
}};
static
BOOL
barray
[
4
]
=
{
FALSE
,
100
,
TRUE
,
TRUE
};
ID3DXConstantTable
*
ctable
;
...
...
@@ -672,6 +673,9 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device)
res
=
ID3DXConstantTable_SetMatrixArray
(
ctable
,
device
,
"fmtxarray"
,
fmtxarray
,
2
);
ok
(
res
==
D3D_OK
,
"ID3DXConstantTable_SetMatrixArray failed: got 0x%08x
\n
"
,
res
);
res
=
ID3DXConstantTable_SetBoolArray
(
ctable
,
device
,
"barray"
,
barray
,
2
);
ok
(
res
==
D3D_OK
,
"ID3DXConstantTable_SetBoolArray failed: got 0x%08x
\n
"
,
res
);
/* Read back constants */
IDirect3DDevice9_GetVertexShaderConstantF
(
device
,
8
,
out
,
4
);
ok
(
out
[
0
]
==
farray
[
0
]
&&
out
[
4
]
==
farray
[
1
]
&&
out
[
8
]
==
farray
[
2
]
&&
out
[
12
]
==
farray
[
3
],
...
...
@@ -686,6 +690,13 @@ static void test_setting_arrays_table(IDirect3DDevice9 *device)
fvecarray
[
0
].
x
,
fvecarray
[
0
].
y
,
fvecarray
[
0
].
z
,
fvecarray
[
0
].
w
,
fvecarray
[
1
].
x
,
fvecarray
[
1
].
y
,
fvecarray
[
1
].
z
,
fvecarray
[
1
].
w
);
IDirect3DDevice9_GetVertexShaderConstantF
(
device
,
14
,
out
,
2
);
ok
(
out
[
0
]
==
0
.
0
f
&&
out
[
1
]
==
0
.
0
f
&&
out
[
2
]
==
0
.
0
f
&&
out
[
3
]
==
0
.
0
f
&&
out
[
4
]
==
1
.
0
f
&&
out
[
5
]
==
0
.
0
f
&&
out
[
6
]
==
0
.
0
f
&&
out
[
7
]
==
0
.
0
f
,
"The variable barray was not set correctly, out={%f, %f %f, %f; %f, %f, %f, %f}, should be {%f, %f, %f, %f; %f, %f, %f, %f}
\n
"
,
out
[
0
],
out
[
1
],
out
[
2
],
out
[
3
],
out
[
4
],
out
[
5
],
out
[
6
],
out
[
7
],
0
.
0
f
,
0
.
0
f
,
0
.
0
f
,
0
.
0
f
,
1
.
0
f
,
0
.
0
f
,
0
.
0
f
,
0
.
0
f
);
IDirect3DDevice9_GetVertexShaderConstantF
(
device
,
0
,
out
,
8
);
/* Just check a few elements in each matrix to make sure fmtxarray was set row-major */
ok
(
out
[
0
]
==
S
(
U
(
fmtxarray
[
0
])).
_11
&&
out
[
1
]
==
S
(
U
(
fmtxarray
[
0
])).
_12
&&
out
[
2
]
==
S
(
U
(
fmtxarray
[
0
])).
_13
&&
out
[
3
]
==
S
(
U
(
fmtxarray
[
0
])).
_14
,
...
...
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