Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
98f73ca2
Commit
98f73ca2
authored
10 months ago
by
Conor McCarthy
Committed by
Alexandre Julliard
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
vkd3d-shader/ir: Allow all DCL instructions to occur outside hull shader phases.
parent
def87539
No related branches found
No related tags found
1 merge request
!857
vkd3d-shader: Miscellaneous SM 6 patches.
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/vkd3d-shader/ir.c
+3
-6
3 additions, 6 deletions
libs/vkd3d-shader/ir.c
with
3 additions
and
6 deletions
libs/vkd3d-shader/ir.c
+
3
−
6
View file @
98f73ca2
...
@@ -5748,11 +5748,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
...
@@ -5748,11 +5748,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
instruction
->
declaration
.
max_tessellation_factor
);
instruction
->
declaration
.
max_tessellation_factor
);
return
;
return
;
/* The DXIL parser can generate these outside phases, but this is not an issue. */
case
VKD3DSIH_DCL_INPUT
:
case
VKD3DSIH_DCL_OUTPUT
:
return
;
case
VKD3DSIH_DCL_INPUT_PRIMITIVE
:
case
VKD3DSIH_DCL_INPUT_PRIMITIVE
:
if
(
instruction
->
declaration
.
primitive_type
.
type
==
VKD3D_PT_UNDEFINED
if
(
instruction
->
declaration
.
primitive_type
.
type
==
VKD3D_PT_UNDEFINED
||
instruction
->
declaration
.
primitive_type
.
type
>=
VKD3D_PT_COUNT
)
||
instruction
->
declaration
.
primitive_type
.
type
>=
VKD3D_PT_COUNT
)
...
@@ -5810,7 +5805,9 @@ static void vsir_validate_instruction(struct validation_context *ctx)
...
@@ -5810,7 +5805,9 @@ static void vsir_validate_instruction(struct validation_context *ctx)
break
;
break
;
}
}
if
(
version
->
type
==
VKD3D_SHADER_TYPE_HULL
&&
ctx
->
phase
==
VKD3DSIH_INVALID
)
/* Only DCL instructions may occur outside hull shader phases. */
if
(
!
vsir_instruction_is_dcl
(
instruction
)
&&
version
->
type
==
VKD3D_SHADER_TYPE_HULL
&&
ctx
->
phase
==
VKD3DSIH_INVALID
)
validator_error
(
ctx
,
VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER
,
validator_error
(
ctx
,
VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER
,
"Instruction %#x appear before any phase instruction in a hull shader."
,
"Instruction %#x appear before any phase instruction in a hull shader."
,
instruction
->
handler_idx
);
instruction
->
handler_idx
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment