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
70799e1c
Commit
70799e1c
authored
Apr 03, 2024
by
Nikolay Sivov
Committed by
Alexandre Julliard
Apr 03, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d2d1/effect: Implement border transform object.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
parent
48d043d3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
173 additions
and
8 deletions
+173
-8
d2d1_private.h
dlls/d2d1/d2d1_private.h
+5
-0
effect.c
dlls/d2d1/effect.c
+163
-2
d2d1.c
dlls/d2d1/tests/d2d1.c
+5
-6
No files found.
dlls/d2d1/d2d1_private.h
View file @
70799e1c
...
...
@@ -717,6 +717,11 @@ struct d2d_transform
{
D2D1_POINT_2L
offset
;
D2D1_BLEND_DESCRIPTION
blend_desc
;
struct
{
D2D1_EXTEND_MODE
mode_x
;
D2D1_EXTEND_MODE
mode_y
;
}
border
;
};
UINT32
input_count
;
...
...
dlls/d2d1/effect.c
View file @
70799e1c
...
...
@@ -30,6 +30,11 @@ static inline struct d2d_transform *impl_from_ID2D1BlendTransform(ID2D1BlendTran
return
CONTAINING_RECORD
(
iface
,
struct
d2d_transform
,
ID2D1TransformNode_iface
);
}
static
inline
struct
d2d_transform
*
impl_from_ID2D1BorderTransform
(
ID2D1BorderTransform
*
iface
)
{
return
CONTAINING_RECORD
(
iface
,
struct
d2d_transform
,
ID2D1TransformNode_iface
);
}
static
HRESULT
STDMETHODCALLTYPE
d2d_offset_transform_QueryInterface
(
ID2D1OffsetTransform
*
iface
,
REFIID
iid
,
void
**
out
)
{
...
...
@@ -247,6 +252,162 @@ static HRESULT d2d_blend_transform_create(UINT32 input_count, const D2D1_BLEND_D
return
S_OK
;
}
static
HRESULT
STDMETHODCALLTYPE
d2d_border_transform_QueryInterface
(
ID2D1BorderTransform
*
iface
,
REFIID
iid
,
void
**
out
)
{
TRACE
(
"iface %p, iid %s, out %p.
\n
"
,
iface
,
debugstr_guid
(
iid
),
out
);
if
(
IsEqualGUID
(
iid
,
&
IID_ID2D1BorderTransform
)
||
IsEqualGUID
(
iid
,
&
IID_ID2D1ConcreteTransform
)
||
IsEqualGUID
(
iid
,
&
IID_ID2D1TransformNode
)
||
IsEqualGUID
(
iid
,
&
IID_IUnknown
))
{
*
out
=
iface
;
ID2D1BorderTransform_AddRef
(
iface
);
return
S_OK
;
}
WARN
(
"Unsupported interface %s.
\n
"
,
debugstr_guid
(
iid
));
*
out
=
NULL
;
return
E_NOINTERFACE
;
}
static
ULONG
STDMETHODCALLTYPE
d2d_border_transform_AddRef
(
ID2D1BorderTransform
*
iface
)
{
struct
d2d_transform
*
transform
=
impl_from_ID2D1BorderTransform
(
iface
);
ULONG
refcount
=
InterlockedIncrement
(
&
transform
->
refcount
);
TRACE
(
"%p increasing refcount to %lu.
\n
"
,
iface
,
refcount
);
return
refcount
;
}
static
ULONG
STDMETHODCALLTYPE
d2d_border_transform_Release
(
ID2D1BorderTransform
*
iface
)
{
struct
d2d_transform
*
transform
=
impl_from_ID2D1BorderTransform
(
iface
);
ULONG
refcount
=
InterlockedDecrement
(
&
transform
->
refcount
);
TRACE
(
"%p decreasing refcount to %lu.
\n
"
,
iface
,
refcount
);
if
(
!
refcount
)
free
(
transform
);
return
refcount
;
}
static
UINT32
STDMETHODCALLTYPE
d2d_border_transform_GetInputCount
(
ID2D1BorderTransform
*
iface
)
{
TRACE
(
"iface %p.
\n
"
,
iface
);
return
1
;
}
static
HRESULT
STDMETHODCALLTYPE
d2d_border_transform_SetOutputBuffer
(
ID2D1BorderTransform
*
iface
,
D2D1_BUFFER_PRECISION
precision
,
D2D1_CHANNEL_DEPTH
depth
)
{
FIXME
(
"iface %p, precision %u, depth %u stub.
\n
"
,
iface
,
precision
,
depth
);
return
E_NOTIMPL
;
}
static
void
STDMETHODCALLTYPE
d2d_border_transform_SetCached
(
ID2D1BorderTransform
*
iface
,
BOOL
is_cached
)
{
FIXME
(
"iface %p, is_cached %d stub.
\n
"
,
iface
,
is_cached
);
}
static
void
STDMETHODCALLTYPE
d2d_border_transform_SetExtendModeX
(
ID2D1BorderTransform
*
iface
,
D2D1_EXTEND_MODE
mode
)
{
struct
d2d_transform
*
transform
=
impl_from_ID2D1BorderTransform
(
iface
);
TRACE
(
"iface %p.
\n
"
,
iface
);
switch
(
mode
)
{
case
D2D1_EXTEND_MODE_CLAMP
:
case
D2D1_EXTEND_MODE_WRAP
:
case
D2D1_EXTEND_MODE_MIRROR
:
transform
->
border
.
mode_x
=
mode
;
break
;
default:
;
}
}
static
void
STDMETHODCALLTYPE
d2d_border_transform_SetExtendModeY
(
ID2D1BorderTransform
*
iface
,
D2D1_EXTEND_MODE
mode
)
{
struct
d2d_transform
*
transform
=
impl_from_ID2D1BorderTransform
(
iface
);
TRACE
(
"iface %p.
\n
"
,
iface
);
switch
(
mode
)
{
case
D2D1_EXTEND_MODE_CLAMP
:
case
D2D1_EXTEND_MODE_WRAP
:
case
D2D1_EXTEND_MODE_MIRROR
:
transform
->
border
.
mode_y
=
mode
;
break
;
default:
;
}
}
static
D2D1_EXTEND_MODE
STDMETHODCALLTYPE
d2d_border_transform_GetExtendModeX
(
ID2D1BorderTransform
*
iface
)
{
struct
d2d_transform
*
transform
=
impl_from_ID2D1BorderTransform
(
iface
);
TRACE
(
"iface %p.
\n
"
,
iface
);
return
transform
->
border
.
mode_x
;
}
static
D2D1_EXTEND_MODE
STDMETHODCALLTYPE
d2d_border_transform_GetExtendModeY
(
ID2D1BorderTransform
*
iface
)
{
struct
d2d_transform
*
transform
=
impl_from_ID2D1BorderTransform
(
iface
);
TRACE
(
"iface %p.
\n
"
,
iface
);
return
transform
->
border
.
mode_y
;
}
static
const
ID2D1BorderTransformVtbl
d2d_border_transform_vtbl
=
{
d2d_border_transform_QueryInterface
,
d2d_border_transform_AddRef
,
d2d_border_transform_Release
,
d2d_border_transform_GetInputCount
,
d2d_border_transform_SetOutputBuffer
,
d2d_border_transform_SetCached
,
d2d_border_transform_SetExtendModeX
,
d2d_border_transform_SetExtendModeY
,
d2d_border_transform_GetExtendModeX
,
d2d_border_transform_GetExtendModeY
,
};
static
HRESULT
d2d_border_transform_create
(
D2D1_EXTEND_MODE
mode_x
,
D2D1_EXTEND_MODE
mode_y
,
ID2D1BorderTransform
**
transform
)
{
struct
d2d_transform
*
object
;
*
transform
=
NULL
;
if
(
!
(
object
=
calloc
(
1
,
sizeof
(
*
object
))))
return
E_OUTOFMEMORY
;
object
->
ID2D1TransformNode_iface
.
lpVtbl
=
(
ID2D1TransformNodeVtbl
*
)
&
d2d_border_transform_vtbl
;
object
->
refcount
=
1
;
object
->
border
.
mode_x
=
mode_x
;
object
->
border
.
mode_y
=
mode_y
;
*
transform
=
(
ID2D1BorderTransform
*
)
&
object
->
ID2D1TransformNode_iface
;
return
S_OK
;
}
static
struct
d2d_transform_node
*
d2d_transform_graph_get_node
(
const
struct
d2d_transform_graph
*
graph
,
ID2D1TransformNode
*
object
)
{
...
...
@@ -1157,9 +1318,9 @@ static HRESULT STDMETHODCALLTYPE d2d_effect_context_CreateBlendTransform(ID2D1Ef
static
HRESULT
STDMETHODCALLTYPE
d2d_effect_context_CreateBorderTransform
(
ID2D1EffectContext
*
iface
,
D2D1_EXTEND_MODE
mode_x
,
D2D1_EXTEND_MODE
mode_y
,
ID2D1BorderTransform
**
transform
)
{
FIXME
(
"iface %p, mode_x %#x, mode_y %#x, transform %p stub!
\n
"
,
iface
,
mode_x
,
mode_y
,
transform
);
TRACE
(
"iface %p, mode_x %#x, mode_y %#x, transform %p.
\n
"
,
iface
,
mode_x
,
mode_y
,
transform
);
return
E_NOTIMPL
;
return
d2d_border_transform_create
(
mode_x
,
mode_y
,
transform
)
;
}
static
HRESULT
STDMETHODCALLTYPE
d2d_effect_context_CreateOffsetTransform
(
ID2D1EffectContext
*
iface
,
...
...
dlls/d2d1/tests/d2d1.c
View file @
70799e1c
...
...
@@ -13048,9 +13048,7 @@ static void test_border_transform(BOOL d3d11)
/* Create transform with invalid extend mode */
hr
=
ID2D1EffectContext_CreateBorderTransform
(
effect_context
,
0xdeadbeef
,
0xdeadbeef
,
&
transform
);
todo_wine
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
if
(
hr
!=
S_OK
)
goto
done
;
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
mode
=
ID2D1BorderTransform_GetExtendModeX
(
transform
);
ok
(
mode
==
0xdeadbeef
,
"Got unexpected extend mode %u.
\n
"
,
mode
);
mode
=
ID2D1BorderTransform_GetExtendModeY
(
transform
);
...
...
@@ -13073,10 +13071,13 @@ static void test_border_transform(BOOL d3d11)
/* Set output buffer */
hr
=
ID2D1BorderTransform_SetOutputBuffer
(
transform
,
0xdeadbeef
,
D2D1_CHANNEL_DEPTH_DEFAULT
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
hr
=
ID2D1BorderTransform_SetOutputBuffer
(
transform
,
D2D1_BUFFER_PRECISION_UNKNOWN
,
0xdeadbeef
);
todo_wine
ok
(
hr
==
E_INVALIDARG
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
hr
=
ID2D1BorderTransform_SetOutputBuffer
(
transform
,
D2D1_BUFFER_PRECISION_UNKNOWN
,
D2D1_CHANNEL_DEPTH_DEFAULT
);
todo_wine
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
/* Set extend mode */
...
...
@@ -13095,9 +13096,7 @@ static void test_border_transform(BOOL d3d11)
mode
=
ID2D1BorderTransform_GetExtendModeY
(
transform
);
ok
(
mode
==
D2D1_EXTEND_MODE_CLAMP
,
"Got unexpected extend mode %u.
\n
"
,
mode
);
done:
if
(
transform
)
ID2D1BorderTransform_Release
(
transform
);
ID2D1BorderTransform_Release
(
transform
);
ID2D1Effect_Release
(
effect
);
hr
=
ID2D1Factory1_UnregisterEffect
(
factory
,
&
CLSID_TestEffect
);
ok
(
hr
==
S_OK
,
"Got unexpected hr %#lx.
\n
"
,
hr
);
...
...
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