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
57f6a016
Commit
57f6a016
authored
Feb 22, 2018
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SPV: Complete OpModuleProcessed implementation, enabled by have 1.2 headers.
parent
e1cc1e2e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
SpvBuilder.cpp
SPIRV/SpvBuilder.cpp
+1
-2
SpvBuilder.h
SPIRV/SpvBuilder.h
+0
-1
doc.cpp
SPIRV/doc.cpp
+5
-0
No files found.
SPIRV/SpvBuilder.cpp
View file @
57f6a016
...
@@ -2421,7 +2421,6 @@ void Builder::dump(std::vector<unsigned int>& out) const
...
@@ -2421,7 +2421,6 @@ void Builder::dump(std::vector<unsigned int>& out) const
// Debug instructions
// Debug instructions
dumpInstructions
(
out
,
strings
);
dumpInstructions
(
out
,
strings
);
dumpModuleProcesses
(
out
);
dumpSourceInstructions
(
out
);
dumpSourceInstructions
(
out
);
for
(
int
e
=
0
;
e
<
(
int
)
sourceExtensions
.
size
();
++
e
)
{
for
(
int
e
=
0
;
e
<
(
int
)
sourceExtensions
.
size
();
++
e
)
{
Instruction
sourceExtInst
(
0
,
0
,
OpSourceExtension
);
Instruction
sourceExtInst
(
0
,
0
,
OpSourceExtension
);
...
@@ -2429,7 +2428,7 @@ void Builder::dump(std::vector<unsigned int>& out) const
...
@@ -2429,7 +2428,7 @@ void Builder::dump(std::vector<unsigned int>& out) const
sourceExtInst
.
dump
(
out
);
sourceExtInst
.
dump
(
out
);
}
}
dumpInstructions
(
out
,
names
);
dumpInstructions
(
out
,
names
);
dump
Instructions
(
out
,
lines
);
dump
ModuleProcesses
(
out
);
// Annotation instructions
// Annotation instructions
dumpInstructions
(
out
,
decorations
);
dumpInstructions
(
out
,
decorations
);
...
...
SPIRV/SpvBuilder.h
View file @
57f6a016
...
@@ -616,7 +616,6 @@ public:
...
@@ -616,7 +616,6 @@ public:
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
entryPoints
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
entryPoints
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
executionModes
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
executionModes
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
names
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
names
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
lines
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
decorations
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
decorations
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
constantsTypesGlobals
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
constantsTypesGlobals
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
externals
;
std
::
vector
<
std
::
unique_ptr
<
Instruction
>
>
externals
;
...
...
SPIRV/doc.cpp
View file @
57f6a016
...
@@ -1197,6 +1197,8 @@ const char* OpcodeString(int op)
...
@@ -1197,6 +1197,8 @@ const char* OpcodeString(int op)
case
319
:
return
"OpAtomicFlagClear"
;
case
319
:
return
"OpAtomicFlagClear"
;
case
320
:
return
"OpImageSparseRead"
;
case
320
:
return
"OpImageSparseRead"
;
case
OpModuleProcessed
:
return
"OpModuleProcesses"
;
case
4421
:
return
"OpSubgroupBallotKHR"
;
case
4421
:
return
"OpSubgroupBallotKHR"
;
case
4422
:
return
"OpSubgroupFirstInvocationKHR"
;
case
4422
:
return
"OpSubgroupFirstInvocationKHR"
;
case
4428
:
return
"OpSubgroupAllKHR"
;
case
4428
:
return
"OpSubgroupAllKHR"
;
...
@@ -1348,6 +1350,7 @@ void Parameterize()
...
@@ -1348,6 +1350,7 @@ void Parameterize()
InstructionDesc
[
OpReleaseEvent
].
setResultAndType
(
false
,
false
);
InstructionDesc
[
OpReleaseEvent
].
setResultAndType
(
false
,
false
);
InstructionDesc
[
OpGroupWaitEvents
].
setResultAndType
(
false
,
false
);
InstructionDesc
[
OpGroupWaitEvents
].
setResultAndType
(
false
,
false
);
InstructionDesc
[
OpAtomicFlagClear
].
setResultAndType
(
false
,
false
);
InstructionDesc
[
OpAtomicFlagClear
].
setResultAndType
(
false
,
false
);
InstructionDesc
[
OpModuleProcessed
].
setResultAndType
(
false
,
false
);
// Specific additional context-dependent operands
// Specific additional context-dependent operands
...
@@ -2839,6 +2842,8 @@ void Parameterize()
...
@@ -2839,6 +2842,8 @@ void Parameterize()
InstructionDesc
[
OpSubgroupReadInvocationKHR
].
operands
.
push
(
OperandId
,
"'Value'"
);
InstructionDesc
[
OpSubgroupReadInvocationKHR
].
operands
.
push
(
OperandId
,
"'Value'"
);
InstructionDesc
[
OpSubgroupReadInvocationKHR
].
operands
.
push
(
OperandId
,
"'Index'"
);
InstructionDesc
[
OpSubgroupReadInvocationKHR
].
operands
.
push
(
OperandId
,
"'Index'"
);
InstructionDesc
[
OpModuleProcessed
].
operands
.
push
(
OperandLiteralString
,
"'process'"
);
#ifdef AMD_EXTENSIONS
#ifdef AMD_EXTENSIONS
InstructionDesc
[
OpGroupIAddNonUniformAMD
].
capabilities
.
push_back
(
CapabilityGroups
);
InstructionDesc
[
OpGroupIAddNonUniformAMD
].
capabilities
.
push_back
(
CapabilityGroups
);
InstructionDesc
[
OpGroupIAddNonUniformAMD
].
operands
.
push
(
OperandScope
,
"'Execution'"
);
InstructionDesc
[
OpGroupIAddNonUniformAMD
].
operands
.
push
(
OperandScope
,
"'Execution'"
);
...
...
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