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
3ec327c5
Commit
3ec327c5
authored
Dec 13, 2016
by
Jamie Madill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix size_t to int cast warnings.
Several instances in Visual Studio 2015: warning C4267: 'initializing': conversion from 'size_t' to 'int', possible loss of data
parent
20f01e7f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
Intermediate.cpp
glslang/MachineIndependent/Intermediate.cpp
+1
-1
hlslParseHelper.cpp
hlsl/hlslParseHelper.cpp
+5
-5
No files found.
glslang/MachineIndependent/Intermediate.cpp
View file @
3ec327c5
...
...
@@ -2241,7 +2241,7 @@ bool TIntermediate::promoteAggregate(TIntermAggregate& node)
{
TOperator
op
=
node
.
getOp
();
TIntermSequence
&
args
=
node
.
getSequence
();
const
int
numArgs
=
args
.
size
(
);
const
int
numArgs
=
static_cast
<
int
>
(
args
.
size
()
);
// Presently, only hlsl does intrinsic promotions.
if
(
getSource
()
!=
EShSourceHlsl
)
...
...
hlsl/hlslParseHelper.cpp
View file @
3ec327c5
...
...
@@ -957,13 +957,13 @@ int HlslParseContext::addFlattenedMember(const TSourceLoc& loc,
if
(
flattenData
.
nextBinding
!=
TQualifier
::
layoutBindingEnd
)
memberVariable
->
getWritableType
().
getQualifier
().
layoutBinding
=
flattenData
.
nextBinding
++
;
flattenData
.
offsets
.
push_back
(
flattenData
.
members
.
size
(
));
flattenData
.
offsets
.
push_back
(
static_cast
<
int
>
(
flattenData
.
members
.
size
()
));
flattenData
.
members
.
push_back
(
memberVariable
);
if
(
track
)
trackLinkageDeferred
(
*
memberVariable
);
return
flattenData
.
offsets
.
size
(
)
-
1
;
// location of the member reference
return
static_cast
<
int
>
(
flattenData
.
offsets
.
size
()
)
-
1
;
// location of the member reference
}
else
{
// Further recursion required
return
flatten
(
loc
,
variable
,
type
,
flattenData
,
memberName
);
...
...
@@ -985,7 +985,7 @@ int HlslParseContext::flattenStruct(const TSourceLoc& loc, const TVariable& vari
auto
members
=
*
type
.
getStruct
();
// Reserve space for this tree level.
int
start
=
flattenData
.
offsets
.
size
(
);
int
start
=
static_cast
<
int
>
(
flattenData
.
offsets
.
size
()
);
int
pos
=
start
;
flattenData
.
offsets
.
resize
(
int
(
pos
+
members
.
size
()),
-
1
);
...
...
@@ -1022,7 +1022,7 @@ int HlslParseContext::flattenArray(const TSourceLoc& loc, const TVariable& varia
name
=
variable
.
getName
();
// Reserve space for this tree level.
int
start
=
flattenData
.
offsets
.
size
(
);
int
start
=
static_cast
<
int
>
(
flattenData
.
offsets
.
size
()
);
int
pos
=
start
;
flattenData
.
offsets
.
resize
(
int
(
pos
+
size
),
-
1
);
...
...
@@ -4977,7 +4977,7 @@ TIntermTyped* HlslParseContext::convertInitializerList(const TSourceLoc& loc, co
return
addConstructor
(
loc
,
initList
,
arrayType
);
}
else
if
(
type
.
isStruct
())
{
// lengthen list to be long enough
lengthenList
(
loc
,
initList
->
getSequence
(),
type
.
getStruct
()
->
size
(
));
lengthenList
(
loc
,
initList
->
getSequence
(),
static_cast
<
int
>
(
type
.
getStruct
()
->
size
()
));
if
(
type
.
getStruct
()
->
size
()
!=
initList
->
getSequence
().
size
())
{
error
(
loc
,
"wrong number of structure members"
,
"initializer list"
,
""
);
...
...
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