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
264732a8
Commit
264732a8
authored
Mar 24, 2021
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mfplat: Implement GetContiguousLength() for d3d11 buffer.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
dae643d2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
buffer.c
dlls/mfplat/buffer.c
+1
-8
mfplat.c
dlls/mfplat/tests/mfplat.c
+12
-1
No files found.
dlls/mfplat/buffer.c
View file @
264732a8
...
@@ -888,13 +888,6 @@ static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa
...
@@ -888,13 +888,6 @@ static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa
return
E_NOTIMPL
;
return
E_NOTIMPL
;
}
}
static
HRESULT
WINAPI
dxgi_surface_buffer_GetContiguousLength
(
IMF2DBuffer2
*
iface
,
DWORD
*
length
)
{
FIXME
(
"%p, %p.
\n
"
,
iface
,
length
);
return
E_NOTIMPL
;
}
static
HRESULT
WINAPI
dxgi_surface_buffer_Lock2DSize
(
IMF2DBuffer2
*
iface
,
MF2DBuffer_LockFlags
flags
,
static
HRESULT
WINAPI
dxgi_surface_buffer_Lock2DSize
(
IMF2DBuffer2
*
iface
,
MF2DBuffer_LockFlags
flags
,
BYTE
**
scanline0
,
LONG
*
pitch
,
BYTE
**
buffer_start
,
DWORD
*
buffer_length
)
BYTE
**
scanline0
,
LONG
*
pitch
,
BYTE
**
buffer_start
,
DWORD
*
buffer_length
)
{
{
...
@@ -1001,7 +994,7 @@ static const IMF2DBuffer2Vtbl dxgi_surface_buffer_vtbl =
...
@@ -1001,7 +994,7 @@ static const IMF2DBuffer2Vtbl dxgi_surface_buffer_vtbl =
dxgi_surface_buffer_Unlock2D
,
dxgi_surface_buffer_Unlock2D
,
dxgi_surface_buffer_GetScanline0AndPitch
,
dxgi_surface_buffer_GetScanline0AndPitch
,
memory_2d_buffer_IsContiguousFormat
,
memory_2d_buffer_IsContiguousFormat
,
dxgi_surface
_buffer_GetContiguousLength
,
memory_2d
_buffer_GetContiguousLength
,
memory_2d_buffer_ContiguousCopyTo
,
memory_2d_buffer_ContiguousCopyTo
,
memory_2d_buffer_ContiguousCopyFrom
,
memory_2d_buffer_ContiguousCopyFrom
,
dxgi_surface_buffer_Lock2DSize
,
dxgi_surface_buffer_Lock2DSize
,
...
...
dlls/mfplat/tests/mfplat.c
View file @
264732a8
...
@@ -6312,10 +6312,11 @@ static ID3D11Device *create_d3d11_device(void)
...
@@ -6312,10 +6312,11 @@ static ID3D11Device *create_d3d11_device(void)
static
void
test_dxgi_surface_buffer
(
void
)
static
void
test_dxgi_surface_buffer
(
void
)
{
{
DWORD
max_length
,
cur_length
,
color
;
DWORD
max_length
,
cur_length
,
length
,
color
;
IMFDXGIBuffer
*
dxgi_buffer
;
IMFDXGIBuffer
*
dxgi_buffer
;
D3D11_TEXTURE2D_DESC
desc
;
D3D11_TEXTURE2D_DESC
desc
;
ID3D11Texture2D
*
texture
;
ID3D11Texture2D
*
texture
;
IMF2DBuffer
*
_2d_buffer
;
IMFMediaBuffer
*
buffer
;
IMFMediaBuffer
*
buffer
;
ID3D11Device
*
device
;
ID3D11Device
*
device
;
UINT
index
,
size
;
UINT
index
,
size
;
...
@@ -6366,6 +6367,16 @@ static void test_dxgi_surface_buffer(void)
...
@@ -6366,6 +6367,16 @@ static void test_dxgi_surface_buffer(void)
ok
(
hr
==
S_OK
,
"Failed to get length, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to get length, hr %#x.
\n
"
,
hr
);
ok
(
cur_length
==
2
*
max_length
,
"Unexpected length %u.
\n
"
,
cur_length
);
ok
(
cur_length
==
2
*
max_length
,
"Unexpected length %u.
\n
"
,
cur_length
);
hr
=
IMFMediaBuffer_QueryInterface
(
buffer
,
&
IID_IMF2DBuffer
,
(
void
**
)
&
_2d_buffer
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMF2DBuffer_GetContiguousLength
(
_2d_buffer
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMF2DBuffer_GetContiguousLength
(
_2d_buffer
,
&
length
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
length
==
max_length
,
"Unexpected length %u.
\n
"
,
length
);
IMF2DBuffer_Release
(
_2d_buffer
);
hr
=
IMFMediaBuffer_QueryInterface
(
buffer
,
&
IID_IMFDXGIBuffer
,
(
void
**
)
&
dxgi_buffer
);
hr
=
IMFMediaBuffer_QueryInterface
(
buffer
,
&
IID_IMFDXGIBuffer
,
(
void
**
)
&
dxgi_buffer
);
ok
(
hr
==
S_OK
,
"Failed to get interface, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to get interface, hr %#x.
\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