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
e50dc536
Commit
e50dc536
authored
Nov 26, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Warn on HLSL not finding entry point. Issue #588.
parent
517fe7a6
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
23 additions
and
2 deletions
+23
-2
hlsl.array.implicit-size.frag.out
Test/baseResults/hlsl.array.implicit-size.frag.out
+1
-0
hlsl.float1.frag.out
Test/baseResults/hlsl.float1.frag.out
+1
-0
hlsl.float4.frag.out
Test/baseResults/hlsl.float4.frag.out
+1
-0
hlsl.intrinsics.vert.out
Test/baseResults/hlsl.intrinsics.vert.out
+1
-0
hlsl.layout.frag.out
Test/baseResults/hlsl.layout.frag.out
+1
-0
hlsl.matType.frag.out
Test/baseResults/hlsl.matType.frag.out
+1
-0
hlsl.shapeConv.frag.out
Test/baseResults/hlsl.shapeConv.frag.out
+1
-0
hlsl.swizzle.frag.out
Test/baseResults/hlsl.swizzle.frag.out
+1
-0
hlsl.typedef.frag.out
Test/baseResults/hlsl.typedef.frag.out
+1
-0
revision.h
glslang/Include/revision.h
+1
-1
linkValidate.cpp
glslang/MachineIndependent/linkValidate.cpp
+12
-1
localintermediate.h
glslang/MachineIndependent/localintermediate.h
+1
-0
No files found.
Test/baseResults/hlsl.array.implicit-size.frag.out
View file @
e50dc536
...
@@ -81,6 +81,7 @@ gl_FragCoord origin is upper left
...
@@ -81,6 +81,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
Test/baseResults/hlsl.float1.frag.out
View file @
e50dc536
...
@@ -32,6 +32,7 @@ gl_FragCoord origin is upper left
...
@@ -32,6 +32,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
Test/baseResults/hlsl.float4.frag.out
View file @
e50dc536
...
@@ -22,6 +22,7 @@ gl_FragCoord origin is upper left
...
@@ -22,6 +22,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
Test/baseResults/hlsl.intrinsics.vert.out
View file @
e50dc536
...
@@ -1396,6 +1396,7 @@ Shader version: 450
...
@@ -1396,6 +1396,7 @@ Shader version: 450
Linked vertex stage:
Linked vertex stage:
WARNING: Linking vertex stage: Entry point not found
Shader version: 450
Shader version: 450
0:? Sequence
0:? Sequence
...
...
Test/baseResults/hlsl.layout.frag.out
View file @
e50dc536
...
@@ -33,6 +33,7 @@ gl_FragCoord origin is upper left
...
@@ -33,6 +33,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
Test/baseResults/hlsl.matType.frag.out
View file @
e50dc536
...
@@ -15,6 +15,7 @@ gl_FragCoord origin is upper left
...
@@ -15,6 +15,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
Test/baseResults/hlsl.shapeConv.frag.out
View file @
e50dc536
...
@@ -115,6 +115,7 @@ gl_FragCoord origin is upper left
...
@@ -115,6 +115,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
Test/baseResults/hlsl.swizzle.frag.out
View file @
e50dc536
...
@@ -38,6 +38,7 @@ gl_FragCoord origin is upper left
...
@@ -38,6 +38,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
Test/baseResults/hlsl.typedef.frag.out
View file @
e50dc536
...
@@ -39,6 +39,7 @@ gl_FragCoord origin is upper left
...
@@ -39,6 +39,7 @@ gl_FragCoord origin is upper left
Linked fragment stage:
Linked fragment stage:
WARNING: Linking fragment stage: Entry point not found
Shader version: 450
Shader version: 450
gl_FragCoord origin is upper left
gl_FragCoord origin is upper left
...
...
glslang/Include/revision.h
View file @
e50dc536
...
@@ -2,5 +2,5 @@
...
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// 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).
// For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.166
0
"
#define GLSLANG_REVISION "Overload400-PrecQual.166
1
"
#define GLSLANG_DATE "26-Nov-2016"
#define GLSLANG_DATE "26-Nov-2016"
glslang/MachineIndependent/linkValidate.cpp
View file @
e50dc536
...
@@ -60,6 +60,13 @@ void TIntermediate::error(TInfoSink& infoSink, const char* message)
...
@@ -60,6 +60,13 @@ void TIntermediate::error(TInfoSink& infoSink, const char* message)
++
numErrors
;
++
numErrors
;
}
}
// Link-time warning.
void
TIntermediate
::
warn
(
TInfoSink
&
infoSink
,
const
char
*
message
)
{
infoSink
.
info
.
prefix
(
EPrefixWarning
);
infoSink
.
info
<<
"Linking "
<<
StageName
(
language
)
<<
" stage: "
<<
message
<<
"
\n
"
;
}
// TODO: 4.4 offset/align: "Two blocks linked together in the same program with the same block
// TODO: 4.4 offset/align: "Two blocks linked together in the same program with the same block
// name must have the exact same set of members qualified with offset and their integral-constant
// name must have the exact same set of members qualified with offset and their integral-constant
// expression values must be the same, or a link-time error results."
// expression values must be the same, or a link-time error results."
...
@@ -370,8 +377,12 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
...
@@ -370,8 +377,12 @@ void TIntermediate::mergeErrorCheck(TInfoSink& infoSink, const TIntermSymbol& sy
//
//
void
TIntermediate
::
finalCheck
(
TInfoSink
&
infoSink
)
void
TIntermediate
::
finalCheck
(
TInfoSink
&
infoSink
)
{
{
if
(
source
==
EShSourceGlsl
&&
numEntryPoints
<
1
)
if
(
numEntryPoints
<
1
)
{
if
(
source
==
EShSourceGlsl
)
error
(
infoSink
,
"Missing entry point: Each stage requires one entry point"
);
error
(
infoSink
,
"Missing entry point: Each stage requires one entry point"
);
else
warn
(
infoSink
,
"Entry point not found"
);
}
if
(
numPushConstants
>
1
)
if
(
numPushConstants
>
1
)
error
(
infoSink
,
"Only one push_constant block is allowed per stage"
);
error
(
infoSink
,
"Only one push_constant block is allowed per stage"
);
...
...
glslang/MachineIndependent/localintermediate.h
View file @
e50dc536
...
@@ -385,6 +385,7 @@ public:
...
@@ -385,6 +385,7 @@ public:
protected
:
protected
:
TIntermSymbol
*
addSymbol
(
int
Id
,
const
TString
&
,
const
TType
&
,
const
TConstUnionArray
&
,
TIntermTyped
*
subtree
,
const
TSourceLoc
&
);
TIntermSymbol
*
addSymbol
(
int
Id
,
const
TString
&
,
const
TType
&
,
const
TConstUnionArray
&
,
TIntermTyped
*
subtree
,
const
TSourceLoc
&
);
void
error
(
TInfoSink
&
infoSink
,
const
char
*
);
void
error
(
TInfoSink
&
infoSink
,
const
char
*
);
void
warn
(
TInfoSink
&
infoSink
,
const
char
*
);
void
mergeBodies
(
TInfoSink
&
,
TIntermSequence
&
globals
,
const
TIntermSequence
&
unitGlobals
);
void
mergeBodies
(
TInfoSink
&
,
TIntermSequence
&
globals
,
const
TIntermSequence
&
unitGlobals
);
void
mergeLinkerObjects
(
TInfoSink
&
,
TIntermSequence
&
linkerObjects
,
const
TIntermSequence
&
unitLinkerObjects
);
void
mergeLinkerObjects
(
TInfoSink
&
,
TIntermSequence
&
linkerObjects
,
const
TIntermSequence
&
unitLinkerObjects
);
void
mergeImplicitArraySizes
(
TType
&
,
const
TType
&
);
void
mergeImplicitArraySizes
(
TType
&
,
const
TType
&
);
...
...
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