Interfaces: Remove NV_EXTENSIONS from two more headers.

This also fixes some cpp files that uncover issues when building
with the flags turned off.
This commit is contained in:
John Kessenich 2018-09-26 09:14:30 -06:00
parent 01c4076a16
commit 5ff3c3da3b
4 changed files with 11 additions and 18 deletions

View file

@ -1576,27 +1576,29 @@ bool TIntermediate::canImplicitlyPromote(TBasicType from, TBasicType to, TOperat
return false;
}
case EbtFloat16:
switch (from) {
#ifdef AMD_EXTENSIONS
switch (from) {
case EbtInt16:
case EbtUint16:
return extensionRequested(E_GL_AMD_gpu_shader_int16);
case EbtFloat16:
return extensionRequested(E_GL_AMD_gpu_shader_half_float);
#endif
default:
return false;
}
break;
}
#endif
return false;
case EbtUint16:
switch (from) {
#ifdef AMD_EXTENSIONS
switch (from) {
case EbtInt16:
case EbtUint16:
return extensionRequested(E_GL_AMD_gpu_shader_int16);
#endif
default:
return false;
}
break;
}
#endif
return false;
default:
return false;
}