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
e4821e43
Commit
e4821e43
authored
Jul 16, 2016
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build: Fix three new warnings in HLSL code.
parent
35dcbbef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
hlslGrammar.cpp
hlsl/hlslGrammar.cpp
+1
-1
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+1
-1
hlslParseables.cpp
hlsl/hlslParseables.cpp
+2
-2
No files found.
hlsl/hlslGrammar.cpp
View file @
e4821e43
...
@@ -211,7 +211,7 @@ bool HlslGrammar::acceptSamplerState()
...
@@ -211,7 +211,7 @@ bool HlslGrammar::acceptSamplerState()
// sampler_declaration_dx9
// sampler_declaration_dx9
// : SAMPLER identifier EQUAL sampler_type sampler_state
// : SAMPLER identifier EQUAL sampler_type sampler_state
//
//
bool
HlslGrammar
::
acceptSamplerDeclarationDX9
(
TType
&
type
)
bool
HlslGrammar
::
acceptSamplerDeclarationDX9
(
TType
&
/*type*/
)
{
{
if
(
!
acceptTokenClass
(
EHTokSampler
))
if
(
!
acceptTokenClass
(
EHTokSampler
))
return
false
;
return
false
;
...
...
hlsl/hlslParseHelper.cpp
View file @
e4821e43
...
@@ -906,7 +906,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
...
@@ -906,7 +906,7 @@ void HlslParseContext::decomposeSampleMethods(const TSourceLoc& loc, TIntermType
TOperator
textureOp
=
EOpTexture
;
TOperator
textureOp
=
EOpTexture
;
if
(
argAggregate
->
getSequence
().
size
()
==
(
nextArg
+
1
))
{
// last parameter is offset form
if
(
(
int
)
argAggregate
->
getSequence
().
size
()
==
(
nextArg
+
1
))
{
// last parameter is offset form
textureOp
=
EOpTextureOffset
;
textureOp
=
EOpTextureOffset
;
argOffset
=
argAggregate
->
getSequence
()[
nextArg
++
]
->
getAsTyped
();
argOffset
=
argAggregate
->
getSequence
()[
nextArg
++
]
->
getAsTyped
();
}
}
...
...
hlsl/hlslParseables.cpp
View file @
e4821e43
...
@@ -69,7 +69,7 @@ const char* BaseTypeName(const char argOrder, const char* scalarName, const char
...
@@ -69,7 +69,7 @@ const char* BaseTypeName(const char argOrder, const char* scalarName, const char
bool
IsTextureType
(
const
char
argOrder
)
{
return
argOrder
==
'%'
||
argOrder
==
'@'
;
}
bool
IsTextureType
(
const
char
argOrder
)
{
return
argOrder
==
'%'
||
argOrder
==
'@'
;
}
bool
IsTextureArrayed
(
const
char
argOrder
)
{
return
argOrder
==
'@'
;
}
bool
IsTextureArrayed
(
const
char
argOrder
)
{
return
argOrder
==
'@'
;
}
bool
IsTextureMS
(
const
char
argOrder
)
{
return
false
;
}
// TODO: ...
bool
IsTextureMS
(
const
char
/*argOrder*/
)
{
return
false
;
}
// TODO: ...
// Reject certain combinations that are illegal sample methods. For example,
// Reject certain combinations that are illegal sample methods. For example,
// 3D arrays.
// 3D arrays.
...
@@ -118,7 +118,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
...
@@ -118,7 +118,7 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons
const
bool
isMatMul
=
(
argOrder
[
0
]
==
'#'
);
const
bool
isMatMul
=
(
argOrder
[
0
]
==
'#'
);
const
bool
isTexture
=
IsTextureType
(
argOrder
[
0
]);
const
bool
isTexture
=
IsTextureType
(
argOrder
[
0
]);
const
bool
isArrayed
=
IsTextureArrayed
(
argOrder
[
0
]);
const
bool
isArrayed
=
IsTextureArrayed
(
argOrder
[
0
]);
const
bool
isMS
=
IsTextureMS
(
argOrder
[
0
]);
//
const bool isMS = IsTextureMS(argOrder[0]);
char
order
=
*
argOrder
;
char
order
=
*
argOrder
;
char
type
=
*
argType
;
char
type
=
*
argType
;
...
...
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