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
aa8d4979
Commit
aa8d4979
authored
Nov 29, 2019
by
Joshua Ashton
🐸
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[d3d9] Fix order of setting constant type and offset for shared stage info
parent
3be8016f
Pipeline
#921
passed with stage
in 10 minutes and 6 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
src/d3d9/d3d9_fixed_function.cpp
src/d3d9/d3d9_fixed_function.cpp
+5
-5
No files found.
src/d3d9/d3d9_fixed_function.cpp
View file @
aa8d4979
...
...
@@ -364,13 +364,13 @@ namespace dxvk {
uint32_t
vec4_t
=
spvModule
.
defVectorType
(
float_t
,
4
);
std
::
array
<
uint32_t
,
D3D9SharedPSStages_Count
>
stageMembers
=
{
vec4_t
,
vec2_t
,
vec2_t
,
float_t
,
float_t
,
vec4_t
};
std
::
array
<
decltype
(
stageMembers
),
caps
::
TextureStageCount
>
members
;
...
...
@@ -385,6 +385,9 @@ namespace dxvk {
uint32_t
offset
=
0
;
for
(
uint32_t
stage
=
0
;
stage
<
caps
::
TextureStageCount
;
stage
++
)
{
spvModule
.
memberDecorateOffset
(
structType
,
stage
*
D3D9SharedPSStages_Count
+
D3D9SharedPSStages_Constant
,
offset
);
offset
+=
sizeof
(
float
)
*
4
;
spvModule
.
memberDecorateOffset
(
structType
,
stage
*
D3D9SharedPSStages_Count
+
D3D9SharedPSStages_BumpEnvMat0
,
offset
);
offset
+=
sizeof
(
float
)
*
2
;
...
...
@@ -397,9 +400,6 @@ namespace dxvk {
spvModule
.
memberDecorateOffset
(
structType
,
stage
*
D3D9SharedPSStages_Count
+
D3D9SharedPSStages_BumpEnvLOffset
,
offset
);
offset
+=
sizeof
(
float
);
spvModule
.
memberDecorateOffset
(
structType
,
stage
*
D3D9SharedPSStages_Count
+
D3D9SharedPSStages_Constant
,
offset
);
offset
+=
sizeof
(
float
)
*
4
;
// Padding...
offset
+=
sizeof
(
float
)
*
2
;
}
...
...
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