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
567396b6
Commit
567396b6
authored
Feb 11, 2019
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Whitespace: Fix some tabs->spaces, mostly to retriggered failed bots.
parent
9840f11f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
Versions.cpp
glslang/MachineIndependent/Versions.cpp
+1
-1
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+2
-2
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+3
-3
No files found.
glslang/MachineIndependent/Versions.cpp
View file @
567396b6
...
@@ -1025,7 +1025,7 @@ void TParseVersions::float16OpaqueCheck(const TSourceLoc& loc, const char* op, b
...
@@ -1025,7 +1025,7 @@ void TParseVersions::float16OpaqueCheck(const TSourceLoc& loc, const char* op, b
void
TParseVersions
::
explicitInt16Check
(
const
TSourceLoc
&
loc
,
const
char
*
op
,
bool
builtIn
)
void
TParseVersions
::
explicitInt16Check
(
const
TSourceLoc
&
loc
,
const
char
*
op
,
bool
builtIn
)
{
{
if
(
!
builtIn
)
{
if
(
!
builtIn
)
{
const
char
*
const
extensions
[]
=
{
const
char
*
const
extensions
[]
=
{
#if AMD_EXTENSIONS
#if AMD_EXTENSIONS
E_GL_AMD_gpu_shader_int16
,
E_GL_AMD_gpu_shader_int16
,
#endif
#endif
...
...
hlsl/hlslGrammar.cpp
View file @
567396b6
...
@@ -1197,7 +1197,7 @@ bool HlslGrammar::acceptSamplerTypeDX9(TType &type)
...
@@ -1197,7 +1197,7 @@ bool HlslGrammar::acceptSamplerTypeDX9(TType &type)
TSampler
sampler
;
TSampler
sampler
;
sampler
.
set
(
txType
.
getBasicType
(),
dim
,
false
,
isShadow
,
false
);
sampler
.
set
(
txType
.
getBasicType
(),
dim
,
false
,
isShadow
,
false
);
if
(
!
parseContext
.
setTextureReturnType
(
sampler
,
txType
,
token
.
loc
))
if
(
!
parseContext
.
setTextureReturnType
(
sampler
,
txType
,
token
.
loc
))
return
false
;
return
false
;
type
.
shallowCopy
(
TType
(
sampler
,
EvqUniform
,
arraySizes
));
type
.
shallowCopy
(
TType
(
sampler
,
EvqUniform
,
arraySizes
));
...
@@ -1489,7 +1489,7 @@ bool HlslGrammar::acceptType(TType& type, TIntermNode*& nodeList)
...
@@ -1489,7 +1489,7 @@ bool HlslGrammar::acceptType(TType& type, TIntermNode*& nodeList)
case
EHTokSampler3d
:
// ...
case
EHTokSampler3d
:
// ...
case
EHTokSamplerCube
:
// ...
case
EHTokSamplerCube
:
// ...
if
(
parseContext
.
hlslDX9Compatible
())
if
(
parseContext
.
hlslDX9Compatible
())
return
acceptSamplerTypeDX9
(
type
);
return
acceptSamplerTypeDX9
(
type
);
else
else
return
acceptSamplerType
(
type
);
return
acceptSamplerType
(
type
);
break
;
break
;
...
...
hlsl/hlslParseHelper.cpp
View file @
567396b6
...
@@ -3255,8 +3255,8 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte
...
@@ -3255,8 +3255,8 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte
if
(
argAggregate
)
{
if
(
argAggregate
)
{
if
(
argAggregate
->
getSequence
().
empty
())
if
(
argAggregate
->
getSequence
().
empty
())
return
;
return
;
if
(
argAggregate
->
getSequence
()[
0
])
if
(
argAggregate
->
getSequence
()[
0
])
bufferObj
=
argAggregate
->
getSequence
()[
0
]
->
getAsTyped
();
bufferObj
=
argAggregate
->
getSequence
()[
0
]
->
getAsTyped
();
}
else
{
}
else
{
bufferObj
=
arguments
->
getAsSymbolNode
();
bufferObj
=
arguments
->
getAsSymbolNode
();
}
}
...
@@ -3756,7 +3756,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
...
@@ -3756,7 +3756,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
return
;
return
;
}
else
{
}
else
{
if
(
argAggregate
->
getSequence
().
size
()
==
0
||
if
(
argAggregate
->
getSequence
().
size
()
==
0
||
argAggregate
->
getSequence
()[
0
]
==
nullptr
||
argAggregate
->
getSequence
()[
0
]
==
nullptr
||
argAggregate
->
getSequence
()[
0
]
->
getAsTyped
()
->
getBasicType
()
!=
EbtSampler
)
argAggregate
->
getSequence
()[
0
]
->
getAsTyped
()
->
getBasicType
()
!=
EbtSampler
)
return
;
return
;
}
}
...
...
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