Merge pull request #1401 from dj2/roll-deps-22

Roll deps and update tests.
This commit is contained in:
Hans-Kristian Arntzen 2020-06-22 16:10:12 +02:00 committed by GitHub
commit f9ae06512e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions

View File

@ -1,8 +1,8 @@
#!/bin/bash
GLSLANG_REV=2cf9621d6d6f3b5e38f471709f45d35720a7ffee
SPIRV_TOOLS_REV=b0264b87ffb5e50159dafe897d8e50cbd308affc
SPIRV_HEADERS_REV=ac638f1815425403e946d0ab78bac71d2bdbf3be
GLSLANG_REV=839704450200e407490c538418f4d1a493b789ab
SPIRV_TOOLS_REV=d4b9f576ebb48e716efe14c7ea634a11427fa34d
SPIRV_HEADERS_REV=11d7637e7a43cd88cfd4e42c99581dcb682936aa
if [ -z $PROTOCOL ]; then
PROTOCOL=git

View File

@ -10,7 +10,7 @@ float _188;
void main()
{
if (_11.data != 0.0)
if (!(_11.data == 0.0))
{
_11.data = 10.0;
}

View File

@ -77,7 +77,7 @@ void test_conversions()
half one = test_result();
int a = int(one);
uint b = uint(one);
bool c = one != half(0.0);
bool c = (isunordered(one, half(0.0)) || one != half(0.0));
float d = float(one);
half a2 = half(a);
half b2 = half(b);
@ -152,7 +152,7 @@ void test_builtins(thread half4& v4, thread half3& v3, thread half& v1)
btmp = v4 > v4;
btmp = v4 >= v4;
btmp = v4 == v4;
btmp = v4 != v4;
btmp = (isunordered(v4, v4) || v4 != v4);
res = dfdx(v4);
res = dfdy(v4);
res = dfdx(v4);

View File

@ -50,7 +50,7 @@ void test_conversions()
float16_t one = test_result();
int a = int(one);
uint b = uint(one);
bool c = one != float16_t(0.0);
bool c = !(one == float16_t(0.0));
float d = float(one);
double e = double(one);
float16_t a2 = float16_t(a);
@ -126,7 +126,7 @@ void test_builtins()
btmp = greaterThan(v4, v4);
btmp = greaterThanEqual(v4, v4);
btmp = equal(v4, v4);
btmp = notEqual(v4, v4);
btmp = not(equal(v4, v4));
res = dFdx(v4);
res = dFdy(v4);
res = dFdxFine(v4);

View File

@ -8,7 +8,7 @@ layout(binding = 0, std430) buffer SSBO
void test()
{
if (_11.data != 0.0)
if (!(_11.data == 0.0))
{
float tmp = 10.0;
_11.data = tmp;
@ -18,12 +18,12 @@ void test()
float tmp_1 = 15.0;
_11.data = tmp_1;
}
if (_11.data != 0.0)
if (!(_11.data == 0.0))
{
float e;
if (_11.data != 5.0)
if (!(_11.data == 5.0))
{
if (_11.data != 6.0)
if (!(_11.data == 6.0))
{
e = 10.0;
}
@ -70,7 +70,7 @@ void test()
float m;
do
{
} while (m != 20.0);
} while (!(m == 20.0));
_11.data = m;
}