Update SPIRV-Headers (#4628)

* Fix compile
* Fix test
This commit is contained in:
alan-baker 2021-11-10 16:32:09 -05:00 committed by GitHub
parent b014238e08
commit 21e3f681e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

2
DEPS
View File

@ -6,7 +6,7 @@ vars = {
'effcee_revision': 'ddf5e2bb92957dc8a12c5392f8495333d6844133', 'effcee_revision': 'ddf5e2bb92957dc8a12c5392f8495333d6844133',
'googletest_revision': 'bf0701daa9f5b30e5882e2f8f9a5280bcba87e77', 'googletest_revision': 'bf0701daa9f5b30e5882e2f8f9a5280bcba87e77',
're2_revision': '4244cd1cb492fa1d10986ec67f862964c073f844', 're2_revision': '4244cd1cb492fa1d10986ec67f862964c073f844',
'spirv_headers_revision': '29817199b7069bac971e5365d180295d4b077ebe', 'spirv_headers_revision': '814e728b30ddd0f4509233099a3ad96fd4318c07',
} }
deps = { deps = {

View File

@ -52,7 +52,7 @@ inline bool IsTypeInst(SpvOp opcode) {
} }
inline bool IsConstantInst(SpvOp opcode) { inline bool IsConstantInst(SpvOp opcode) {
return (opcode >= SpvOpConstantTrue && opcode <= SpvOpSpecConstantOp) || return (opcode >= SpvOpConstantTrue && opcode <= SpvOpSpecConstantOp) ||
opcode == SpvOpConstFunctionPointerINTEL; opcode == SpvOpConstantFunctionPointerINTEL;
} }
inline bool IsCompileTimeConstantInst(SpvOp opcode) { inline bool IsCompileTimeConstantInst(SpvOp opcode) {
return opcode >= SpvOpConstantTrue && opcode <= SpvOpConstantNull; return opcode >= SpvOpConstantTrue && opcode <= SpvOpConstantNull;

View File

@ -115,7 +115,7 @@ TEST(IrBuilder, RoundTripFunctionPointer) {
"%float = OpTypeFloat 32\n" "%float = OpTypeFloat 32\n"
"%4 = OpTypeFunction %float %float\n" "%4 = OpTypeFunction %float %float\n"
"%_ptr_Function_4 = OpTypePointer Function %4\n" "%_ptr_Function_4 = OpTypePointer Function %4\n"
"%ptr_to_function = OpConstFunctionPointerINTEL %_ptr_Function_4 " "%ptr_to_function = OpConstantFunctionPointerINTEL %_ptr_Function_4 "
"%some_function\n" "%some_function\n"
"%some_function = OpFunction %float Const %4\n" "%some_function = OpFunction %float Const %4\n"
"%6 = OpFunctionParameter %float\n" "%6 = OpFunctionParameter %float\n"