Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
glslang
Project
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
glslang
Commits
de3b8e3b
Commit
de3b8e3b
authored
Feb 01, 2019
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #1682: flesh out more vulkan/SPV ModuleProcessed
parent
f96d7dc2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
3 deletions
+33
-3
spv.debugInfo.1.1.frag.out
Test/baseResults/spv.debugInfo.1.1.frag.out
+1
-0
Versions.h
glslang/MachineIndependent/Versions.h
+1
-1
localintermediate.h
glslang/MachineIndependent/localintermediate.h
+31
-2
No files found.
Test/baseResults/spv.debugInfo.1.1.frag.out
View file @
de3b8e3b
...
...
@@ -83,6 +83,7 @@ void main()
ModuleProcessed "resource-set-binding 3"
ModuleProcessed "auto-map-locations"
ModuleProcessed "client opengl100"
ModuleProcessed "target-env spirv1.3"
ModuleProcessed "target-env opengl"
ModuleProcessed "relaxed-errors"
ModuleProcessed "suppress-warnings"
...
...
glslang/MachineIndependent/Versions.h
View file @
de3b8e3b
...
...
@@ -74,7 +74,7 @@ inline const char* ProfileName(EProfile profile)
}
//
// What source rules, validation rules, target language, etc. are needed
// What source rules, validation rules, target language, etc. are needed
or
// desired for SPIR-V?
//
// 0 means a target or rule set is not enabled (ignore rules from that entity).
...
...
glslang/MachineIndependent/localintermediate.h
View file @
de3b8e3b
...
...
@@ -420,11 +420,40 @@ public:
if
(
spvVersion
.
openGl
>
0
)
processes
.
addProcess
(
"client opengl100"
);
// target SPV
switch
(
spvVersion
.
spv
)
{
case
0
:
break
;
case
EShTargetSpv_1_0
:
break
;
case
EShTargetSpv_1_1
:
processes
.
addProcess
(
"target-env spirv1.1"
);
break
;
case
EShTargetSpv_1_2
:
processes
.
addProcess
(
"target-env spirv1.2"
);
break
;
case
EShTargetSpv_1_3
:
processes
.
addProcess
(
"target-env spirv1.3"
);
break
;
default
:
processes
.
addProcess
(
"target-env spirvUnknown"
);
break
;
}
// target-environment processes
if
(
spvVersion
.
vulkan
>
0
)
switch
(
spvVersion
.
vulkan
)
{
case
0
:
break
;
case
EShTargetVulkan_1_0
:
processes
.
addProcess
(
"target-env vulkan1.0"
);
else
if
(
spvVersion
.
vulkan
>
0
)
break
;
case
EShTargetVulkan_1_1
:
processes
.
addProcess
(
"target-env vulkan1.1"
);
break
;
default
:
processes
.
addProcess
(
"target-env vulkanUnknown"
);
break
;
}
if
(
spvVersion
.
openGl
>
0
)
processes
.
addProcess
(
"target-env opengl"
);
}
...
...
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