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
618141d8
Commit
618141d8
authored
Jul 02, 2022
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jul 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d2d1/effect: Support parsing vector4 property values.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
parent
3c2ce103
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
effect.c
dlls/d2d1/effect.c
+1
-0
d2d1.c
dlls/d2d1/tests/d2d1.c
+17
-1
No files found.
dlls/d2d1/effect.c
View file @
618141d8
...
...
@@ -361,6 +361,7 @@ static HRESULT d2d_effect_properties_internal_add(struct d2d_effect_properties *
break
;
case
D2D1_PROPERTY_TYPE_VECTOR2
:
case
D2D1_PROPERTY_TYPE_VECTOR3
:
case
D2D1_PROPERTY_TYPE_VECTOR4
:
if
(
FAILED
(
hr
=
d2d_effect_parse_vector_value
(
p
->
type
,
value
,
_vec
)))
{
WARN
(
"Failed to parse vector value %s.
\n
"
,
wine_dbgstr_w
(
value
));
...
...
dlls/d2d1/tests/d2d1.c
View file @
618141d8
...
...
@@ -62,6 +62,10 @@ L"<?xml version='1.0'?> \
<Property name='DisplayName' type='string' value='Vec3 prop'/> \
<Property name='Default' type='vector3' value='(0.1, 0.2, 0.3)'/> \
</Property> \
<Property name='Vec4Prop' type='vector4' value='(8.0,9.0,10.0,11.0)'> \
<Property name='DisplayName' type='string' value='Vec4 prop'/> \
<Property name='Default' type='vector4' value='(0.8,0.9,1.0,1.1)'/> \
</Property> \
</Effect> \
"
;
...
...
@@ -11030,11 +11034,11 @@ static void test_effect_properties(BOOL d3d11)
UINT32
i
,
min_inputs
,
max_inputs
,
integer
,
index
,
size
;
ID2D1EffectContext
*
effect_context
;
D2D1_BUFFER_PRECISION
precision
;
float
vec2
[
2
],
vec3
[
3
],
vec4
[
4
];
ID2D1Properties
*
subproperties
;
D2D1_PROPERTY_TYPE
prop_type
;
struct
d2d1_test_context
ctx
;
ID2D1Factory1
*
factory
;
float
vec2
[
2
],
vec3
[
3
];
ID2D1Effect
*
effect
;
UINT32
count
,
data
;
WCHAR
buffer
[
128
];
...
...
@@ -11152,6 +11156,18 @@ static void test_effect_properties(BOOL d3d11)
ok
(
vec3
[
0
]
==
5
.
0
f
&&
vec3
[
1
]
==
6
.
0
f
&&
vec3
[
2
]
==
7
.
0
f
,
"Unexpected vector (%.8e,%.8e,%.8e).
\n
"
,
vec3
[
0
],
vec3
[
1
],
vec3
[
2
]);
/* Vector4 property. */
index
=
ID2D1Effect_GetPropertyIndex
(
effect
,
L"Vec4Prop"
);
hr
=
ID2D1Effect_GetPropertyName
(
effect
,
index
,
buffer
,
ARRAY_SIZE
(
buffer
));
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
ok
(
!
wcscmp
(
buffer
,
L"Vec4Prop"
),
"Unexpected name %s.
\n
"
,
wine_dbgstr_w
(
buffer
));
prop_type
=
ID2D1Effect_GetType
(
effect
,
index
);
ok
(
prop_type
==
D2D1_PROPERTY_TYPE_VECTOR4
,
"Unexpected type %u.
\n
"
,
prop_type
);
hr
=
ID2D1Effect_GetValue
(
effect
,
index
,
D2D1_PROPERTY_TYPE_VECTOR4
,
(
BYTE
*
)
vec4
,
sizeof
(
vec4
));
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
ok
(
vec4
[
0
]
==
8
.
0
f
&&
vec4
[
1
]
==
9
.
0
f
&&
vec4
[
2
]
==
10
.
0
f
&&
vec4
[
3
]
==
11
.
0
f
,
"Unexpected vector (%.8e,%.8e,%.8e,%.8e).
\n
"
,
vec4
[
0
],
vec4
[
1
],
vec4
[
2
],
vec4
[
3
]);
ID2D1Effect_Release
(
effect
);
hr
=
ID2D1Factory1_UnregisterEffect
(
factory
,
&
CLSID_TestEffect
);
...
...
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