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
6d178658
Commit
6d178658
authored
Dec 17, 2018
by
John Kessenich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build: Make calling argument types match declared parameter types.
Fixes #1630 and fixes #1631.
parent
e26630fe
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
40 deletions
+40
-40
Constant.cpp
glslang/MachineIndependent/Constant.cpp
+40
-40
No files found.
glslang/MachineIndependent/Constant.cpp
View file @
6d178658
...
...
@@ -759,13 +759,13 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
newConstArray
[
i
].
setDConst
(
unionArray
[
i
].
getU8Const
());
break
;
case
EOpConvInt16ToInt8
:
newConstArray
[
i
].
setI8Const
(
static_cast
<
int8_t
>
(
unionArray
[
i
].
getI16Const
()));
break
;
newConstArray
[
i
].
setI8Const
(
static_cast
<
signed
char
>
(
unionArray
[
i
].
getI16Const
()));
break
;
case
EOpConvInt16ToInt
:
newConstArray
[
i
].
setIConst
(
unionArray
[
i
].
getI16Const
());
break
;
case
EOpConvInt16ToInt64
:
newConstArray
[
i
].
setI64Const
(
unionArray
[
i
].
getI16Const
());
break
;
case
EOpConvInt16ToUint8
:
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
int8_t
>
(
unionArray
[
i
].
getI16Const
()));
break
;
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
nsigned
char
>
(
unionArray
[
i
].
getI16Const
()));
break
;
case
EOpConvInt16ToUint16
:
newConstArray
[
i
].
setU16Const
(
unionArray
[
i
].
getI16Const
());
break
;
case
EOpConvInt16ToUint
:
...
...
@@ -773,7 +773,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
case
EOpConvInt16ToUint64
:
newConstArray
[
i
].
setU64Const
(
unionArray
[
i
].
getI16Const
());
break
;
case
EOpConvUint16ToInt8
:
newConstArray
[
i
].
setI8Const
(
static_cast
<
int8_t
>
(
unionArray
[
i
].
getU16Const
()));
break
;
newConstArray
[
i
].
setI8Const
(
static_cast
<
signed
char
>
(
unionArray
[
i
].
getU16Const
()));
break
;
case
EOpConvUint16ToInt16
:
newConstArray
[
i
].
setI16Const
(
unionArray
[
i
].
getU16Const
());
break
;
case
EOpConvUint16ToInt
:
...
...
@@ -781,7 +781,7 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
case
EOpConvUint16ToInt64
:
newConstArray
[
i
].
setI64Const
(
unionArray
[
i
].
getU16Const
());
break
;
case
EOpConvUint16ToUint8
:
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
int8_t
>
(
unionArray
[
i
].
getU16Const
()));
break
;
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
nsigned
char
>
(
unionArray
[
i
].
getU16Const
()));
break
;
case
EOpConvUint16ToUint
:
newConstArray
[
i
].
setUConst
(
unionArray
[
i
].
getU16Const
());
break
;
...
...
@@ -842,33 +842,33 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
case
EOpConvUintToDouble
:
newConstArray
[
i
].
setDConst
(
unionArray
[
i
].
getUConst
());
break
;
case
EOpConvInt64ToInt8
:
newConstArray
[
i
].
setI8Const
(
static_cast
<
int8_t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
newConstArray
[
i
].
setI8Const
(
static_cast
<
signed
char
>
(
unionArray
[
i
].
getI64Const
()));
break
;
case
EOpConvInt64ToInt16
:
newConstArray
[
i
].
setI16Const
(
static_cast
<
int16_
t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
newConstArray
[
i
].
setI16Const
(
static_cast
<
signed
shor
t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
case
EOpConvInt64ToInt
:
newConstArray
[
i
].
setIConst
(
static_cast
<
int
32_t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
newConstArray
[
i
].
setIConst
(
static_cast
<
int
>
(
unionArray
[
i
].
getI64Const
()));
break
;
case
EOpConvInt64ToUint8
:
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
int8_t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
nsigned
char
>
(
unionArray
[
i
].
getI64Const
()));
break
;
case
EOpConvInt64ToUint16
:
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
int16_
t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
nsigned
shor
t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
case
EOpConvInt64ToUint
:
newConstArray
[
i
].
setUConst
(
static_cast
<
u
int32_
t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
newConstArray
[
i
].
setUConst
(
static_cast
<
u
nsigned
in
t
>
(
unionArray
[
i
].
getI64Const
()));
break
;
case
EOpConvInt64ToUint64
:
newConstArray
[
i
].
setU64Const
(
unionArray
[
i
].
getI64Const
());
break
;
case
EOpConvUint64ToInt8
:
newConstArray
[
i
].
setI8Const
(
static_cast
<
int8_t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
newConstArray
[
i
].
setI8Const
(
static_cast
<
signed
char
>
(
unionArray
[
i
].
getU64Const
()));
break
;
case
EOpConvUint64ToInt16
:
newConstArray
[
i
].
setI16Const
(
static_cast
<
int16_
t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
newConstArray
[
i
].
setI16Const
(
static_cast
<
signed
shor
t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
case
EOpConvUint64ToInt
:
newConstArray
[
i
].
setIConst
(
static_cast
<
int
32_t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
newConstArray
[
i
].
setIConst
(
static_cast
<
int
>
(
unionArray
[
i
].
getU64Const
()));
break
;
case
EOpConvUint64ToInt64
:
newConstArray
[
i
].
setI64Const
(
unionArray
[
i
].
getU64Const
());
break
;
case
EOpConvUint64ToUint8
:
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
int8_t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
nsigned
char
>
(
unionArray
[
i
].
getU64Const
()));
break
;
case
EOpConvUint64ToUint16
:
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
int16_
t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
nsigned
shor
t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
case
EOpConvUint64ToUint
:
newConstArray
[
i
].
setUConst
(
static_cast
<
u
int32_
t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
newConstArray
[
i
].
setUConst
(
static_cast
<
u
nsigned
in
t
>
(
unionArray
[
i
].
getU64Const
()));
break
;
case
EOpConvInt64ToFloat16
:
newConstArray
[
i
].
setDConst
(
static_cast
<
double
>
(
unionArray
[
i
].
getI64Const
()));
break
;
case
EOpConvInt64ToFloat
:
...
...
@@ -882,61 +882,61 @@ TIntermTyped* TIntermConstantUnion::fold(TOperator op, const TType& returnType)
case
EOpConvUint64ToDouble
:
newConstArray
[
i
].
setDConst
(
static_cast
<
double
>
(
unionArray
[
i
].
getU64Const
()));
break
;
case
EOpConvFloat16ToInt8
:
newConstArray
[
i
].
setI8Const
(
static_cast
<
int8_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI8Const
(
static_cast
<
signed
char
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToInt16
:
newConstArray
[
i
].
setI16Const
(
static_cast
<
int16_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI16Const
(
static_cast
<
signed
shor
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToInt
:
newConstArray
[
i
].
setIConst
(
static_cast
<
int
32_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setIConst
(
static_cast
<
int
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToInt64
:
newConstArray
[
i
].
setI64Const
(
static_cast
<
int64_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI64Const
(
static_cast
<
long
long
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToUint8
:
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
int8_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
nsigned
char
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToUint16
:
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
int16_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
nsigned
shor
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToUint
:
newConstArray
[
i
].
setUConst
(
static_cast
<
u
int32_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setUConst
(
static_cast
<
u
nsigned
in
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToUint64
:
newConstArray
[
i
].
setU64Const
(
static_cast
<
u
int64_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU64Const
(
static_cast
<
u
nsigned
long
long
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloat16ToFloat
:
newConstArray
[
i
].
setDConst
(
unionArray
[
i
].
getDConst
());
break
;
case
EOpConvFloat16ToDouble
:
newConstArray
[
i
].
setDConst
(
unionArray
[
i
].
getDConst
());
break
;
case
EOpConvFloatToInt8
:
newConstArray
[
i
].
setI8Const
(
static_cast
<
int8_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI8Const
(
static_cast
<
signed
char
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToInt16
:
newConstArray
[
i
].
setI16Const
(
static_cast
<
int16_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI16Const
(
static_cast
<
signed
shor
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToInt
:
newConstArray
[
i
].
setIConst
(
static_cast
<
int
32_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setIConst
(
static_cast
<
int
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToInt64
:
newConstArray
[
i
].
setI64Const
(
static_cast
<
int64_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI64Const
(
static_cast
<
long
long
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToUint8
:
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
int8_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
nsigned
char
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToUint16
:
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
int16_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
nsigned
shor
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToUint
:
newConstArray
[
i
].
setUConst
(
static_cast
<
u
int32_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setUConst
(
static_cast
<
u
nsigned
in
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToUint64
:
newConstArray
[
i
].
setU64Const
(
static_cast
<
u
int64_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU64Const
(
static_cast
<
u
nsigned
long
long
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvFloatToFloat16
:
newConstArray
[
i
].
setDConst
(
unionArray
[
i
].
getDConst
());
break
;
case
EOpConvFloatToDouble
:
newConstArray
[
i
].
setDConst
(
unionArray
[
i
].
getDConst
());
break
;
case
EOpConvDoubleToInt8
:
newConstArray
[
i
].
setI8Const
(
static_cast
<
int8_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI8Const
(
static_cast
<
signed
char
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToInt16
:
newConstArray
[
i
].
setI16Const
(
static_cast
<
int16_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI16Const
(
static_cast
<
signed
shor
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToInt
:
newConstArray
[
i
].
setIConst
(
static_cast
<
int
32_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setIConst
(
static_cast
<
int
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToInt64
:
newConstArray
[
i
].
setI64Const
(
static_cast
<
int64_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setI64Const
(
static_cast
<
long
long
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToUint8
:
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
int8_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU8Const
(
static_cast
<
u
nsigned
char
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToUint16
:
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
int16_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU16Const
(
static_cast
<
u
nsigned
shor
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToUint
:
newConstArray
[
i
].
setUConst
(
static_cast
<
u
int32_
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setUConst
(
static_cast
<
u
nsigned
in
t
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToUint64
:
newConstArray
[
i
].
setU64Const
(
static_cast
<
u
int64_t
>
(
unionArray
[
i
].
getDConst
()));
break
;
newConstArray
[
i
].
setU64Const
(
static_cast
<
u
nsigned
long
long
>
(
unionArray
[
i
].
getDConst
()));
break
;
case
EOpConvDoubleToFloat16
:
newConstArray
[
i
].
setDConst
(
unionArray
[
i
].
getDConst
());
break
;
case
EOpConvDoubleToFloat
:
...
...
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