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
0ab78114
Unverified
Commit
0ab78114
authored
May 18, 2020
by
Chow
Committed by
GitHub
May 18, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add check for DOUBLE in low versions (#2223)
Add check for DOUBLE in low versions, fix issue #2206
parent
7c753a72
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
3 deletions
+26
-3
330.frag
Test/330.frag
+5
-0
330.frag.out
Test/baseResults/330.frag.out
+16
-0
Intermediate.cpp
glslang/MachineIndependent/Intermediate.cpp
+5
-3
No files found.
Test/330.frag
View file @
0ab78114
...
@@ -149,3 +149,7 @@ layout(location=6) uniform ColorsBuffer // ERROR: location cannot be applied in
...
@@ -149,3 +149,7 @@ layout(location=6) uniform ColorsBuffer // ERROR: location cannot be applied in
}
colorsBuffer
;
}
colorsBuffer
;
void
testOverload
()
{
float
overloadTest
=
42
;
overloadTest
=
smoothstep
(
0
,
1
,
overloadTest
);
}
\ No newline at end of file
Test/baseResults/330.frag.out
View file @
0ab78114
...
@@ -83,6 +83,22 @@ ERROR: node is still EOpNull!
...
@@ -83,6 +83,22 @@ ERROR: node is still EOpNull!
0:135 'KeyMem' ( global structure{ global int precise})
0:135 'KeyMem' ( global structure{ global int precise})
0:135 Constant:
0:135 Constant:
0:135 0 (const int)
0:135 0 (const int)
0:152 Function Definition: testOverload( ( global void)
0:152 Function Parameters:
0:153 Sequence
0:153 Sequence
0:153 move second child to first child ( temp float)
0:153 'overloadTest' ( temp float)
0:153 Constant:
0:153 42.000000
0:154 move second child to first child ( temp float)
0:154 'overloadTest' ( temp float)
0:154 smoothstep ( global float)
0:154 Constant:
0:154 0.000000
0:154 Constant:
0:154 1.000000
0:154 'overloadTest' ( temp float)
0:? Linker Objects
0:? Linker Objects
0:? 'inVar' ( smooth in 4-component vector of float)
0:? 'inVar' ( smooth in 4-component vector of float)
0:? 'outVar' (layout( location=0 index=0) out 4-component vector of float)
0:? 'outVar' (layout( location=0 index=0) out 4-component vector of float)
...
...
glslang/MachineIndependent/Intermediate.cpp
View file @
0ab78114
...
@@ -1733,12 +1733,14 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
...
@@ -1733,12 +1733,14 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
case
EbtUint64
:
case
EbtUint64
:
case
EbtFloat
:
case
EbtFloat
:
case
EbtDouble
:
case
EbtDouble
:
return
true
;
return
version
>=
400
||
extensionRequested
(
E_GL_ARB_gpu_shader_fp64
)
;
case
EbtInt16
:
case
EbtInt16
:
case
EbtUint16
:
case
EbtUint16
:
return
extensionRequested
(
E_GL_AMD_gpu_shader_int16
);
return
(
version
>=
400
||
extensionRequested
(
E_GL_ARB_gpu_shader_fp64
))
&&
extensionRequested
(
E_GL_AMD_gpu_shader_int16
);
case
EbtFloat16
:
case
EbtFloat16
:
return
extensionRequested
(
E_GL_AMD_gpu_shader_half_float
);
return
(
version
>=
400
||
extensionRequested
(
E_GL_ARB_gpu_shader_fp64
))
&&
extensionRequested
(
E_GL_AMD_gpu_shader_half_float
);
default
:
default
:
return
false
;
return
false
;
}
}
...
...
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