Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
d9vk
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
Joshua Ashton
d9vk
Commits
e61f99b0
Commit
e61f99b0
authored
Nov 27, 2019
by
Joshua Ashton
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[d3d9] Fix and clarify Get/SetMapFlag interactions
parent
6d7e87c1
Pipeline
#915
passed with stage
in 38 minutes and 20 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
src/d3d9/d3d9_common_buffer.h
src/d3d9/d3d9_common_buffer.h
+2
-2
src/d3d9/d3d9_device.cpp
src/d3d9/d3d9_device.cpp
+4
-2
No files found.
src/d3d9/d3d9_common_buffer.h
View file @
e61f99b0
...
...
@@ -128,9 +128,9 @@ namespace dxvk {
return
m_sliceHandle
;
}
DWORD
GetMapFlags
(
DWORD
Flags
)
{
return
m_mapFlags
;
}
DWORD
GetMapFlags
(
)
const
{
return
m_mapFlags
;
}
DWORD
SetMapFlags
(
DWORD
Flags
)
{
return
std
::
exchange
(
m_mapFlags
,
Flags
)
;
}
DWORD
SetMapFlags
(
DWORD
Flags
)
{
m_mapFlags
=
Flags
;
}
const
D3D9_BUFFER_DESC
*
Desc
()
const
{
return
&
m_desc
;
...
...
src/d3d9/d3d9_device.cpp
View file @
e61f99b0
...
...
@@ -4435,7 +4435,7 @@ namespace dxvk {
*
ppbData
=
reinterpret_cast
<
void
*>
(
data
);
DWORD
oldFlags
=
pResource
->
GetMapFlags
(
Flags
);
DWORD
oldFlags
=
pResource
->
GetMapFlags
();
// We need to remove the READONLY flags from the map flags
// if there was ever a non-readonly upload.
...
...
@@ -4484,9 +4484,11 @@ namespace dxvk {
if
(
pResource
->
GetMapMode
()
!=
D3D9_COMMON_BUFFER_MAP_MODE_BUFFER
)
return
D3D_OK
;
if
(
pResource
->
GetMapFlags
(
0
)
&
D3DLOCK_READONLY
)
if
(
pResource
->
GetMapFlags
()
&
D3DLOCK_READONLY
)
return
D3D_OK
;
pResource
->
SetMapFlags
(
0
);
if
(
pResource
->
Desc
()
->
Pool
!=
D3DPOOL_DEFAULT
)
{
pResource
->
MarkNeedsUpload
();
return
D3D_OK
;
...
...
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