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
601b7fa4
Commit
601b7fa4
authored
Mar 13, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert previous check-in, until knowing what the spec. is and whether the test failure is related.
parent
7a44a31d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
spv.deviceGroup.frag.out
Test/baseResults/spv.deviceGroup.frag.out
+3
-3
spv.multiView.frag.out
Test/baseResults/spv.multiView.frag.out
+3
-3
revision.h
glslang/Include/revision.h
+1
-1
Initialize.cpp
glslang/MachineIndependent/Initialize.cpp
+2
-2
No files found.
Test/baseResults/spv.deviceGroup.frag.out
View file @
601b7fa4
...
...
@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_device_group"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 9
12
EntryPoint Fragment 4 "main" 9
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
SourceExtension "GL_EXT_device_group"
...
...
@@ -25,8 +25,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
8: TypePointer Output 7(fvec4)
9(color): 8(ptr) Variable Output
10: TypeInt 32 1
11: TypePointer
Inpu
t 10(int)
12(gl_DeviceIndex): 11(ptr) Variable
Inpu
t
11: TypePointer
UniformConstan
t 10(int)
12(gl_DeviceIndex): 11(ptr) Variable
UniformConstan
t
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label
...
...
Test/baseResults/spv.multiView.frag.out
View file @
601b7fa4
...
...
@@ -10,7 +10,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Extension "SPV_KHR_multiview"
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 9
12
EntryPoint Fragment 4 "main" 9
ExecutionMode 4 OriginUpperLeft
Source GLSL 450
SourceExtension "GL_EXT_multiview"
...
...
@@ -25,8 +25,8 @@ Warning, version 450 is not yet complete; most version-specific features are pre
8: TypePointer Output 7(fvec4)
9(color): 8(ptr) Variable Output
10: TypeInt 32 1
11: TypePointer
Inpu
t 10(int)
12(gl_ViewIndex): 11(ptr) Variable
Inpu
t
11: TypePointer
UniformConstan
t 10(int)
12(gl_ViewIndex): 11(ptr) Variable
UniformConstan
t
15: 6(float) Constant 0
4(main): 2 Function None 3
5: Label
...
...
glslang/Include/revision.h
View file @
601b7fa4
...
...
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.190
6
"
#define GLSLANG_REVISION "Overload400-PrecQual.190
7
"
#define GLSLANG_DATE "13-Mar-2017"
glslang/MachineIndependent/Initialize.cpp
View file @
601b7fa4
...
...
@@ -3702,8 +3702,8 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
}
if
(
profile
!=
EEsProfile
)
{
commonBuiltins
.
append
(
"
in
int gl_ViewIndex;"
);
commonBuiltins
.
append
(
"
in
int gl_DeviceIndex;"
);
// GL_EXT_device_group
commonBuiltins
.
append
(
"
uniform
int gl_ViewIndex;"
);
commonBuiltins
.
append
(
"
uniform
int gl_DeviceIndex;"
);
// GL_EXT_device_group
}
// printf("%s\n", commonBuiltins.c_str());
...
...
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