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
e91cde52
Commit
e91cde52
authored
Oct 06, 2014
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing gl_MaxGeometryTextureImageUnits.
git-svn-id:
https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@28439
e7fa87d3-cd2b-0410-9028-fcbf551c1848
parent
167b6d1b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
0 deletions
+34
-0
150.geom
Test/150.geom
+20
-0
150.geom.out
Test/baseResults/150.geom.out
+12
-0
Initialize.cpp
glslang/MachineIndependent/Initialize.cpp
+2
-0
No files found.
Test/150.geom
View file @
e91cde52
...
...
@@ -103,3 +103,23 @@ out sameName {
uniform
sameName
{
bool
b15
;
};
float
summ
=
gl_MaxVertexAttribs
+
gl_MaxVertexUniformComponents
+
gl_MaxVaryingFloats
+
gl_MaxVaryingComponents
+
gl_MaxVertexOutputComponents
+
gl_MaxGeometryInputComponents
+
gl_MaxGeometryOutputComponents
+
gl_MaxFragmentInputComponents
+
gl_MaxVertexTextureImageUnits
+
gl_MaxCombinedTextureImageUnits
+
gl_MaxTextureImageUnits
+
gl_MaxFragmentUniformComponents
+
gl_MaxDrawBuffers
+
gl_MaxClipDistances
+
gl_MaxGeometryTextureImageUnits
+
gl_MaxGeometryOutputVertices
+
gl_MaxGeometryTotalOutputComponents
+
gl_MaxGeometryUniformComponents
+
gl_MaxGeometryVaryingComponents
;
Test/baseResults/150.geom.out
View file @
e91cde52
...
...
@@ -124,6 +124,11 @@ ERROR: node is still EOpNull!
0:69 1.000000
0:69 1.000000
0:69 1.000000
0:107 Sequence
0:107 move second child to first child (float)
0:107 'summ' (float)
0:107 Constant:
0:107 11332.000000
0:? Linker Objects
0:? 'fromV' (in 4-element array of block{in 3-component vector of float color})
0:? 'toF' (layout(stream=0 ) out block{layout(stream=0 ) out 3-component vector of float color})
...
...
@@ -148,6 +153,7 @@ ERROR: node is still EOpNull!
0:? 'insn' (in 4-element array of block{in int a15})
0:? 'anon@3' (layout(stream=3 ) out block{layout(stream=3 ) out float f15})
0:? 'anon@4' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform bool b15})
0:? 'summ' (float)
Linked geometry stage:
...
...
@@ -243,6 +249,11 @@ ERROR: node is still EOpNull!
0:69 1.000000
0:69 1.000000
0:69 1.000000
0:107 Sequence
0:107 move second child to first child (float)
0:107 'summ' (float)
0:107 Constant:
0:107 11332.000000
0:? Linker Objects
0:? 'fromV' (in 4-element array of block{in 3-component vector of float color})
0:? 'toF' (layout(stream=0 ) out block{layout(stream=0 ) out 3-component vector of float color})
...
...
@@ -267,4 +278,5 @@ ERROR: node is still EOpNull!
0:? 'insn' (in 4-element array of block{in int a15})
0:? 'anon@3' (layout(stream=3 ) out block{layout(stream=3 ) out float f15})
0:? 'anon@4' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform bool b15})
0:? 'summ' (float)
glslang/MachineIndependent/Initialize.cpp
View file @
e91cde52
...
...
@@ -2386,6 +2386,8 @@ void TBuiltIns::initialize(const TBuiltInResource &resources, int version, EProf
s
.
append
(
builtInConstant
);
snprintf
(
builtInConstant
,
maxSize
,
"const int gl_MaxGeometryOutputComponents = %d;"
,
resources
.
maxGeometryOutputComponents
);
s
.
append
(
builtInConstant
);
snprintf
(
builtInConstant
,
maxSize
,
"const int gl_MaxGeometryTextureImageUnits = %d;"
,
resources
.
maxGeometryTextureImageUnits
);
s
.
append
(
builtInConstant
);
snprintf
(
builtInConstant
,
maxSize
,
"const int gl_MaxGeometryOutputVertices = %d;"
,
resources
.
maxGeometryOutputVertices
);
s
.
append
(
builtInConstant
);
snprintf
(
builtInConstant
,
maxSize
,
"const int gl_MaxGeometryTotalOutputComponents = %d;"
,
resources
.
maxGeometryTotalOutputComponents
);
...
...
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