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
267590d4
Commit
267590d4
authored
Aug 05, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Whitespace: Nonfunctional: fix inconsistent white space, esp. no tabs.
parent
5c72a739
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
7 additions
and
7 deletions
+7
-7
doc.h
SPIRV/doc.h
+0
-0
Link.cpp
glslang/GenericCodeGen/Link.cpp
+0
-0
Common.h
glslang/Include/Common.h
+0
-0
PoolAlloc.h
glslang/Include/PoolAlloc.h
+0
-0
ShHandle.h
glslang/Include/ShHandle.h
+0
-0
revision.h
glslang/Include/revision.h
+1
-1
ParseHelper.cpp
glslang/MachineIndependent/ParseHelper.cpp
+2
-2
PoolAlloc.cpp
glslang/MachineIndependent/PoolAlloc.cpp
+0
-0
SymbolTable.cpp
glslang/MachineIndependent/SymbolTable.cpp
+0
-0
ossource.cpp
glslang/OSDependent/Windows/ossource.cpp
+0
-0
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+1
-1
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+3
-3
No files found.
SPIRV/doc.h
View file @
267590d4
glslang/GenericCodeGen/Link.cpp
View file @
267590d4
glslang/Include/Common.h
View file @
267590d4
glslang/Include/PoolAlloc.h
View file @
267590d4
glslang/Include/ShHandle.h
View file @
267590d4
glslang/Include/revision.h
View file @
267590d4
...
@@ -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 "SPIRV99.13
84
"
#define GLSLANG_REVISION "SPIRV99.13
90
"
#define GLSLANG_DATE "05-Aug-2016"
#define GLSLANG_DATE "05-Aug-2016"
glslang/MachineIndependent/ParseHelper.cpp
View file @
267590d4
...
@@ -253,7 +253,7 @@ void TParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString>&
...
@@ -253,7 +253,7 @@ void TParseContext::handlePragma(const TSourceLoc& loc, const TVector<TString>&
//
//
bool
TParseContext
::
parseVectorFields
(
const
TSourceLoc
&
loc
,
const
TString
&
compString
,
int
vecSize
,
TVectorFields
&
fields
)
bool
TParseContext
::
parseVectorFields
(
const
TSourceLoc
&
loc
,
const
TString
&
compString
,
int
vecSize
,
TVectorFields
&
fields
)
{
{
fields
.
num
=
(
int
)
compString
.
size
();
fields
.
num
=
(
int
)
compString
.
size
();
if
(
fields
.
num
>
4
)
{
if
(
fields
.
num
>
4
)
{
error
(
loc
,
"illegal vector field selection"
,
compString
.
c_str
(),
""
);
error
(
loc
,
"illegal vector field selection"
,
compString
.
c_str
(),
""
);
return
false
;
return
false
;
...
@@ -865,7 +865,7 @@ TIntermTyped* TParseContext::handleDotDereference(const TSourceLoc& loc, TInterm
...
@@ -865,7 +865,7 @@ TIntermTyped* TParseContext::handleDotDereference(const TSourceLoc& loc, TInterm
TString
vectorString
=
field
;
TString
vectorString
=
field
;
TIntermTyped
*
index
=
intermediate
.
addSwizzle
(
fields
,
loc
);
TIntermTyped
*
index
=
intermediate
.
addSwizzle
(
fields
,
loc
);
result
=
intermediate
.
addIndex
(
EOpVectorSwizzle
,
base
,
index
,
loc
);
result
=
intermediate
.
addIndex
(
EOpVectorSwizzle
,
base
,
index
,
loc
);
result
->
setType
(
TType
(
base
->
getBasicType
(),
EvqTemporary
,
base
->
getType
().
getQualifier
().
precision
,
(
int
)
vectorString
.
size
()));
result
->
setType
(
TType
(
base
->
getBasicType
(),
EvqTemporary
,
base
->
getType
().
getQualifier
().
precision
,
(
int
)
vectorString
.
size
()));
}
}
// Swizzle operations propagate specialization-constantness
// Swizzle operations propagate specialization-constantness
if
(
base
->
getType
().
getQualifier
().
isSpecConstant
())
if
(
base
->
getType
().
getQualifier
().
isSpecConstant
())
...
...
glslang/MachineIndependent/PoolAlloc.cpp
View file @
267590d4
glslang/MachineIndependent/SymbolTable.cpp
View file @
267590d4
glslang/OSDependent/Windows/ossource.cpp
View file @
267590d4
hlsl/hlslGrammar.cpp
View file @
267590d4
...
@@ -275,7 +275,7 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
...
@@ -275,7 +275,7 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
// DX9 sampler declaration use a different syntax
// DX9 sampler declaration use a different syntax
// DX9 shaders need to run through HLSL compiler (fxc) via a back compat mode, it isn't going to
// DX9 shaders need to run through HLSL compiler (fxc) via a back compat mode, it isn't going to
// be possible to simultan
ously compile D3D10+ style shaders and DX9 shaders. If we want to compile DX9
// be possible to simultane
ously compile D3D10+ style shaders and DX9 shaders. If we want to compile DX9
// HLSL shaders, this will have to be a master level switch
// HLSL shaders, this will have to be a master level switch
// As such, the sampler keyword in D3D10+ turns into an automatic sampler type, and is commonly used
// As such, the sampler keyword in D3D10+ turns into an automatic sampler type, and is commonly used
// For that reason, this line is commented out
// For that reason, this line is commented out
...
...
hlsl/hlslParseHelper.cpp
View file @
267590d4
...
@@ -998,7 +998,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
...
@@ -998,7 +998,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
const
TSampler
&
texSampler
=
texType
.
getSampler
();
const
TSampler
&
texSampler
=
texType
.
getSampler
();
const
TSamplerDim
dim
=
texSampler
.
dim
;
const
TSamplerDim
dim
=
texSampler
.
dim
;
const
int
numArgs
=
(
int
)
argAggregate
->
getSequence
().
size
();
const
int
numArgs
=
(
int
)
argAggregate
->
getSequence
().
size
();
int
numDims
=
0
;
int
numDims
=
0
;
...
@@ -1184,7 +1184,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
...
@@ -1184,7 +1184,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
lodComponent
->
setType
(
TType
(
coordBaseType
,
EvqTemporary
,
1
));
lodComponent
->
setType
(
TType
(
coordBaseType
,
EvqTemporary
,
1
));
}
}
const
int
numArgs
=
(
int
)
argAggregate
->
getSequence
().
size
();
const
int
numArgs
=
(
int
)
argAggregate
->
getSequence
().
size
();
const
bool
hasOffset
=
((
!
isMS
&&
numArgs
==
3
)
||
(
isMS
&&
numArgs
==
4
));
const
bool
hasOffset
=
((
!
isMS
&&
numArgs
==
3
)
||
(
isMS
&&
numArgs
==
4
));
// Create texel fetch
// Create texel fetch
...
@@ -1228,7 +1228,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
...
@@ -1228,7 +1228,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
TIntermTyped
*
argLod
=
argAggregate
->
getSequence
()[
3
]
->
getAsTyped
();
TIntermTyped
*
argLod
=
argAggregate
->
getSequence
()[
3
]
->
getAsTyped
();
TIntermTyped
*
argOffset
=
nullptr
;
TIntermTyped
*
argOffset
=
nullptr
;
const
int
numArgs
=
(
int
)
argAggregate
->
getSequence
().
size
();
const
int
numArgs
=
(
int
)
argAggregate
->
getSequence
().
size
();
if
(
numArgs
==
5
)
// offset, if present
if
(
numArgs
==
5
)
// offset, if present
argOffset
=
argAggregate
->
getSequence
()[
4
]
->
getAsTyped
();
argOffset
=
argAggregate
->
getSequence
()[
4
]
->
getAsTyped
();
...
...
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