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
aa3c64c2
Commit
aa3c64c2
authored
Mar 28, 2017
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #800 (mostly): set of Linux warnings.
parent
9fb31ce8
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
12 deletions
+11
-12
GlslangToSpv.cpp
SPIRV/GlslangToSpv.cpp
+1
-1
revision.h
glslang/Include/revision.h
+1
-1
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+1
-1
ParseHelper.h
glslang/MachineIndependent/ParseHelper.h
+1
-1
iomapper.cpp
glslang/MachineIndependent/iomapper.cpp
+4
-4
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+2
-2
hlslGrammar.h
hlsl/hlslGrammar.h
+1
-2
No files found.
SPIRV/GlslangToSpv.cpp
View file @
aa3c64c2
...
@@ -2777,7 +2777,7 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
...
@@ -2777,7 +2777,7 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF
if
(
paramType
.
containsOpaque
()
||
// sampler, etc.
if
(
paramType
.
containsOpaque
()
||
// sampler, etc.
(
paramType
.
getBasicType
()
==
glslang
::
EbtBlock
&&
(
paramType
.
getBasicType
()
==
glslang
::
EbtBlock
&&
paramType
.
getQualifier
().
storage
==
glslang
::
EvqBuffer
)
||
// SSBO
paramType
.
getQualifier
().
storage
==
glslang
::
EvqBuffer
)
||
// SSBO
p
==
0
&&
implicitThis
)
// implicit 'this'
(
p
==
0
&&
implicitThis
))
// implicit 'this'
typeId
=
builder
.
makePointer
(
TranslateStorageClass
(
paramType
),
typeId
);
typeId
=
builder
.
makePointer
(
TranslateStorageClass
(
paramType
),
typeId
);
else
if
(
paramType
.
getQualifier
().
storage
!=
glslang
::
EvqConstReadOnly
)
else
if
(
paramType
.
getQualifier
().
storage
!=
glslang
::
EvqConstReadOnly
)
typeId
=
builder
.
makePointer
(
spv
::
StorageClassFunction
,
typeId
);
typeId
=
builder
.
makePointer
(
spv
::
StorageClassFunction
,
typeId
);
...
...
glslang/Include/revision.h
View file @
aa3c64c2
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
// 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.1937"
#define GLSLANG_REVISION "Overload400-PrecQual.1937"
#define GLSLANG_DATE "2
4
-Mar-2017"
#define GLSLANG_DATE "2
8
-Mar-2017"
glslang/MachineIndependent/ParseHelper.cpp
View file @
aa3c64c2
...
@@ -5770,7 +5770,7 @@ void TParseContext::blockStageIoCheck(const TSourceLoc& loc, const TQualifier& q
...
@@ -5770,7 +5770,7 @@ void TParseContext::blockStageIoCheck(const TSourceLoc& loc, const TQualifier& q
}
}
// Do all block-declaration checking regarding its qualifiers.
// Do all block-declaration checking regarding its qualifiers.
void
TParseContext
::
blockQualifierCheck
(
const
TSourceLoc
&
loc
,
const
TQualifier
&
qualifier
,
bool
instanceName
)
void
TParseContext
::
blockQualifierCheck
(
const
TSourceLoc
&
loc
,
const
TQualifier
&
qualifier
,
bool
/*instanceName*/
)
{
{
// The 4.5 specification says:
// The 4.5 specification says:
//
//
...
...
glslang/MachineIndependent/ParseHelper.h
View file @
aa3c64c2
...
@@ -174,7 +174,7 @@ protected:
...
@@ -174,7 +174,7 @@ protected:
int
firstNewMember
;
// the index of the first member not yet inserted into the symbol table
int
firstNewMember
;
// the index of the first member not yet inserted into the symbol table
// override this to set the language-specific name
// override this to set the language-specific name
virtual
const
char
*
getGlobalUniformBlockName
()
const
{
return
""
;
}
virtual
const
char
*
getGlobalUniformBlockName
()
const
{
return
""
;
}
virtual
void
setUniformBlockDefaults
(
TType
&
block
)
const
{
}
virtual
void
setUniformBlockDefaults
(
TType
&
)
const
{
}
virtual
void
finalizeGlobalUniformBlockLayout
(
TVariable
&
)
{
}
virtual
void
finalizeGlobalUniformBlockLayout
(
TVariable
&
)
{
}
virtual
void
outputMessage
(
const
TSourceLoc
&
,
const
char
*
szReason
,
const
char
*
szToken
,
virtual
void
outputMessage
(
const
TSourceLoc
&
,
const
char
*
szReason
,
const
char
*
szToken
,
const
char
*
szExtraInfoFormat
,
TPrefixType
prefix
,
const
char
*
szExtraInfoFormat
,
TPrefixType
prefix
,
...
...
glslang/MachineIndependent/iomapper.cpp
View file @
aa3c64c2
...
@@ -445,19 +445,19 @@ struct TDefaultIoResolver : public glslang::TIoMapResolver
...
@@ -445,19 +445,19 @@ struct TDefaultIoResolver : public glslang::TIoMapResolver
return
0
;
return
0
;
}
}
bool
validateInOut
(
EShLanguage
stage
,
const
char
*
name
,
const
TType
&
type
,
bool
is_live
)
override
bool
validateInOut
(
EShLanguage
/*stage*/
,
const
char
*
/*name*/
,
const
TType
&
/*type*/
,
bool
/*is_live*/
)
override
{
{
return
true
;
return
true
;
}
}
int
resolveInOutLocation
(
EShLanguage
stage
,
const
char
*
name
,
const
TType
&
type
,
bool
is_live
)
override
int
resolveInOutLocation
(
EShLanguage
/*stage*/
,
const
char
*
/*name*/
,
const
TType
&
/*type*/
,
bool
/*is_live*/
)
override
{
{
return
-
1
;
return
-
1
;
}
}
int
resolveInOutComponent
(
EShLanguage
stage
,
const
char
*
name
,
const
TType
&
type
,
bool
is_live
)
override
int
resolveInOutComponent
(
EShLanguage
/*stage*/
,
const
char
*
/*name*/
,
const
TType
&
/*type*/
,
bool
/*is_live*/
)
override
{
{
return
-
1
;
return
-
1
;
}
}
int
resolveInOutIndex
(
EShLanguage
stage
,
const
char
*
name
,
const
TType
&
type
,
bool
is_live
)
override
int
resolveInOutIndex
(
EShLanguage
/*stage*/
,
const
char
*
/*name*/
,
const
TType
&
/*type*/
,
bool
/*is_live*/
)
override
{
{
return
-
1
;
return
-
1
;
}
}
...
...
hlsl/hlslGrammar.cpp
View file @
aa3c64c2
...
@@ -1829,7 +1829,7 @@ bool HlslGrammar::acceptStruct(TType& type, TIntermNode*& nodeList)
...
@@ -1829,7 +1829,7 @@ bool HlslGrammar::acceptStruct(TType& type, TIntermNode*& nodeList)
TVector
<
TFunctionDeclarator
>
functionDeclarators
;
TVector
<
TFunctionDeclarator
>
functionDeclarators
;
parseContext
.
pushNamespace
(
structName
);
parseContext
.
pushNamespace
(
structName
);
bool
acceptedList
=
acceptStructDeclarationList
(
typeList
,
nodeList
,
structName
,
functionDeclarators
);
bool
acceptedList
=
acceptStructDeclarationList
(
typeList
,
nodeList
,
functionDeclarators
);
parseContext
.
popNamespace
();
parseContext
.
popNamespace
();
if
(
!
acceptedList
)
{
if
(
!
acceptedList
)
{
...
@@ -1988,7 +1988,7 @@ bool HlslGrammar::acceptStructBufferType(TType& type)
...
@@ -1988,7 +1988,7 @@ bool HlslGrammar::acceptStructBufferType(TType& type)
// | IDENTIFIER array_specifier post_decls
// | IDENTIFIER array_specifier post_decls
// | IDENTIFIER function_parameters post_decls // member-function prototype
// | IDENTIFIER function_parameters post_decls // member-function prototype
//
//
bool
HlslGrammar
::
acceptStructDeclarationList
(
TTypeList
*&
typeList
,
TIntermNode
*&
nodeList
,
const
TString
&
typeName
,
bool
HlslGrammar
::
acceptStructDeclarationList
(
TTypeList
*&
typeList
,
TIntermNode
*&
nodeList
,
TVector
<
TFunctionDeclarator
>&
declarators
)
TVector
<
TFunctionDeclarator
>&
declarators
)
{
{
typeList
=
new
TTypeList
();
typeList
=
new
TTypeList
();
...
...
hlsl/hlslGrammar.h
View file @
aa3c64c2
...
@@ -87,8 +87,7 @@ namespace glslang {
...
@@ -87,8 +87,7 @@ namespace glslang {
bool
acceptTextureType
(
TType
&
);
bool
acceptTextureType
(
TType
&
);
bool
acceptStructBufferType
(
TType
&
);
bool
acceptStructBufferType
(
TType
&
);
bool
acceptStruct
(
TType
&
,
TIntermNode
*&
nodeList
);
bool
acceptStruct
(
TType
&
,
TIntermNode
*&
nodeList
);
bool
acceptStructDeclarationList
(
TTypeList
*&
,
TIntermNode
*&
nodeList
,
const
TString
&
typeName
,
bool
acceptStructDeclarationList
(
TTypeList
*&
,
TIntermNode
*&
nodeList
,
TVector
<
TFunctionDeclarator
>&
);
TVector
<
TFunctionDeclarator
>&
);
bool
acceptMemberFunctionDefinition
(
TIntermNode
*&
nodeList
,
const
TType
&
,
const
TString
&
memberName
,
bool
acceptMemberFunctionDefinition
(
TIntermNode
*&
nodeList
,
const
TType
&
,
const
TString
&
memberName
,
TFunctionDeclarator
&
);
TFunctionDeclarator
&
);
bool
acceptFunctionParameters
(
TFunction
&
);
bool
acceptFunctionParameters
(
TFunction
&
);
...
...
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