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
3958927a
Commit
3958927a
authored
Feb 07, 2019
by
Sahil Parmar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing support for gl_MeshViewCountNV/gl_MeshViewIndicesNV in task shaders
parent
9dda1281
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
0 deletions
+13
-0
spv.meshTaskShader.task.out
Test/baseResults/spv.meshTaskShader.task.out
+0
-0
spv.meshTaskShader.task
Test/spv.meshTaskShader.task
+5
-0
Initialize.cpp
glslang/MachineIndependent/Initialize.cpp
+8
-0
No files found.
Test/baseResults/spv.meshTaskShader.task.out
View file @
3958927a
This diff is collapsed.
Click to expand it.
Test/spv.meshTaskShader.task
View file @
3958927a
#version 450
#version 450
#define MAX_VIEWS gl_MaxMeshViewCountNV
#define BARRIER() \
#define BARRIER() \
memoryBarrierShared(); \
memoryBarrierShared(); \
barrier();
barrier();
...
@@ -19,12 +21,14 @@ shared vec4 mem[10];
...
@@ -19,12 +21,14 @@ shared vec4 mem[10];
taskNV out Task {
taskNV out Task {
vec2 dummy;
vec2 dummy;
vec2 submesh[3];
vec2 submesh[3];
uint viewID;
} mytask;
} mytask;
void main()
void main()
{
{
uint iid = gl_LocalInvocationID.x;
uint iid = gl_LocalInvocationID.x;
uint gid = gl_WorkGroupID.x;
uint gid = gl_WorkGroupID.x;
uint viewID = gl_MeshViewIndicesNV[gl_MeshViewCountNV%MAX_VIEWS];
// 1. shared memory load and stores
// 1. shared memory load and stores
for (uint i = 0; i < 10; ++i) {
for (uint i = 0; i < 10; ++i) {
...
@@ -41,6 +45,7 @@ void main()
...
@@ -41,6 +45,7 @@ void main()
mytask.submesh[0] = vec2(32.0, 33.0);
mytask.submesh[0] = vec2(32.0, 33.0);
mytask.submesh[1] = vec2(34.0, 35.0);
mytask.submesh[1] = vec2(34.0, 35.0);
mytask.submesh[2] = mytask.submesh[gid%2];
mytask.submesh[2] = mytask.submesh[gid%2];
mytask.viewID = viewID;
BARRIER();
BARRIER();
...
...
glslang/MachineIndependent/Initialize.cpp
View file @
3958927a
...
@@ -5357,6 +5357,9 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
...
@@ -5357,6 +5357,9 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
"in highp uvec3 gl_GlobalInvocationID;"
"in highp uvec3 gl_GlobalInvocationID;"
"in highp uint gl_LocalInvocationIndex;"
"in highp uint gl_LocalInvocationIndex;"
"in uint gl_MeshViewCountNV;"
"in uint gl_MeshViewIndicesNV[4];"
"
\n
"
);
"
\n
"
);
}
}
...
@@ -8843,6 +8846,8 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
...
@@ -8843,6 +8846,8 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
symbolTable
.
setVariableExtensions
(
"gl_LocalInvocationID"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_LocalInvocationID"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_GlobalInvocationID"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_GlobalInvocationID"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_LocalInvocationIndex"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_LocalInvocationIndex"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_MeshViewCountNV"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_MeshViewIndicesNV"
,
1
,
&
E_GL_NV_mesh_shader
);
BuiltInVariable
(
"gl_TaskCountNV"
,
EbvTaskCountNV
,
symbolTable
);
BuiltInVariable
(
"gl_TaskCountNV"
,
EbvTaskCountNV
,
symbolTable
);
BuiltInVariable
(
"gl_WorkGroupSize"
,
EbvWorkGroupSize
,
symbolTable
);
BuiltInVariable
(
"gl_WorkGroupSize"
,
EbvWorkGroupSize
,
symbolTable
);
...
@@ -8850,8 +8855,11 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
...
@@ -8850,8 +8855,11 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
BuiltInVariable
(
"gl_LocalInvocationID"
,
EbvLocalInvocationId
,
symbolTable
);
BuiltInVariable
(
"gl_LocalInvocationID"
,
EbvLocalInvocationId
,
symbolTable
);
BuiltInVariable
(
"gl_GlobalInvocationID"
,
EbvGlobalInvocationId
,
symbolTable
);
BuiltInVariable
(
"gl_GlobalInvocationID"
,
EbvGlobalInvocationId
,
symbolTable
);
BuiltInVariable
(
"gl_LocalInvocationIndex"
,
EbvLocalInvocationIndex
,
symbolTable
);
BuiltInVariable
(
"gl_LocalInvocationIndex"
,
EbvLocalInvocationIndex
,
symbolTable
);
BuiltInVariable
(
"gl_MeshViewCountNV"
,
EbvMeshViewCountNV
,
symbolTable
);
BuiltInVariable
(
"gl_MeshViewIndicesNV"
,
EbvMeshViewIndicesNV
,
symbolTable
);
symbolTable
.
setVariableExtensions
(
"gl_MaxTaskWorkGroupSizeNV"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_MaxTaskWorkGroupSizeNV"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setVariableExtensions
(
"gl_MaxMeshViewCountNV"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setFunctionExtensions
(
"barrier"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setFunctionExtensions
(
"barrier"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setFunctionExtensions
(
"memoryBarrierShared"
,
1
,
&
E_GL_NV_mesh_shader
);
symbolTable
.
setFunctionExtensions
(
"memoryBarrierShared"
,
1
,
&
E_GL_NV_mesh_shader
);
...
...
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