-
Notifications
You must be signed in to change notification settings - Fork 562
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2356 from KhronosGroup/fix-2348
HLSL: Implement SM 6.8 BaseVertex/BaseInstance.
- Loading branch information
Showing
10 changed files
with
182 additions
and
9 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
reference/shaders-hlsl-no-opt/vert/base-instance-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
static float4 gl_Position; | ||
static int gl_BaseInstanceARB; | ||
struct SPIRV_Cross_Input | ||
{ | ||
uint gl_BaseInstanceARB : SV_StartInstanceLocation; | ||
}; | ||
|
||
struct SPIRV_Cross_Output | ||
{ | ||
float4 gl_Position : SV_Position; | ||
}; | ||
|
||
void vert_main() | ||
{ | ||
gl_Position = float(gl_BaseInstanceARB).xxxx; | ||
} | ||
|
||
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input) | ||
{ | ||
gl_BaseInstanceARB = stage_input.gl_BaseInstanceARB; | ||
vert_main(); | ||
SPIRV_Cross_Output stage_output; | ||
stage_output.gl_Position = gl_Position; | ||
return stage_output; | ||
} |
25 changes: 25 additions & 0 deletions
25
reference/shaders-hlsl-no-opt/vert/base-vertex-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
static float4 gl_Position; | ||
static int gl_BaseVertexARB; | ||
struct SPIRV_Cross_Input | ||
{ | ||
uint gl_BaseVertexARB : SV_StartVertexLocation; | ||
}; | ||
|
||
struct SPIRV_Cross_Output | ||
{ | ||
float4 gl_Position : SV_Position; | ||
}; | ||
|
||
void vert_main() | ||
{ | ||
gl_Position = float(gl_BaseVertexARB).xxxx; | ||
} | ||
|
||
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input) | ||
{ | ||
gl_BaseVertexARB = stage_input.gl_BaseVertexARB; | ||
vert_main(); | ||
SPIRV_Cross_Output stage_output; | ||
stage_output.gl_Position = gl_Position; | ||
return stage_output; | ||
} |
28 changes: 28 additions & 0 deletions
28
reference/shaders-hlsl-no-opt/vert/instance-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
static float4 gl_Position; | ||
static int gl_InstanceIndex; | ||
static int gl_BaseInstanceARB; | ||
struct SPIRV_Cross_Input | ||
{ | ||
uint gl_InstanceIndex : SV_InstanceID; | ||
uint gl_BaseInstanceARB : SV_StartInstanceLocation; | ||
}; | ||
|
||
struct SPIRV_Cross_Output | ||
{ | ||
float4 gl_Position : SV_Position; | ||
}; | ||
|
||
void vert_main() | ||
{ | ||
gl_Position = float(gl_InstanceIndex).xxxx; | ||
} | ||
|
||
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input) | ||
{ | ||
gl_InstanceIndex = int(stage_input.gl_InstanceIndex + stage_input.gl_BaseInstanceARB); | ||
gl_BaseInstanceARB = stage_input.gl_BaseInstanceARB; | ||
vert_main(); | ||
SPIRV_Cross_Output stage_output; | ||
stage_output.gl_Position = gl_Position; | ||
return stage_output; | ||
} |
28 changes: 28 additions & 0 deletions
28
reference/shaders-hlsl-no-opt/vert/vertex-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
static float4 gl_Position; | ||
static int gl_VertexIndex; | ||
static int gl_BaseVertexARB; | ||
struct SPIRV_Cross_Input | ||
{ | ||
uint gl_VertexIndex : SV_VertexID; | ||
uint gl_BaseVertexARB : SV_StartVertexLocation; | ||
}; | ||
|
||
struct SPIRV_Cross_Output | ||
{ | ||
float4 gl_Position : SV_Position; | ||
}; | ||
|
||
void vert_main() | ||
{ | ||
gl_Position = float(gl_VertexIndex).xxxx; | ||
} | ||
|
||
SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input) | ||
{ | ||
gl_VertexIndex = int(stage_input.gl_VertexIndex + stage_input.gl_BaseVertexARB); | ||
gl_BaseVertexARB = stage_input.gl_BaseVertexARB; | ||
vert_main(); | ||
SPIRV_Cross_Output stage_output; | ||
stage_output.gl_Position = gl_Position; | ||
return stage_output; | ||
} |
7 changes: 7 additions & 0 deletions
7
shaders-hlsl-no-opt/vert/base-instance-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#version 450 | ||
#extension GL_ARB_shader_draw_parameters : require | ||
|
||
void main() | ||
{ | ||
gl_Position = vec4(gl_BaseInstanceARB); | ||
} |
7 changes: 7 additions & 0 deletions
7
shaders-hlsl-no-opt/vert/base-vertex-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#version 450 | ||
#extension GL_ARB_shader_draw_parameters : require | ||
|
||
void main() | ||
{ | ||
gl_Position = vec4(gl_BaseVertexARB); | ||
} |
6 changes: 6 additions & 0 deletions
6
shaders-hlsl-no-opt/vert/instance-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#version 450 | ||
|
||
void main() | ||
{ | ||
gl_Position = vec4(gl_InstanceIndex); | ||
} |
6 changes: 6 additions & 0 deletions
6
shaders-hlsl-no-opt/vert/vertex-index.sm68.nofxc.fxconly.vert
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#version 450 | ||
|
||
void main() | ||
{ | ||
gl_Position = vec4(gl_VertexIndex); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters