diff options
| author | alan-baker <alanbaker@google.com> | 2022-11-05 00:27:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 00:27:10 +0300 |
| commit | d35a78db57e6c0bca4b284369d12e96292e2dfd5 (patch) | |
| tree | ee67caa5f3397c0dfced6bedb667c51c82b8223e /Android.mk | |
| parent | c8e1588cfa3ff9e3b5d600ef04f4261c4e68af90 (diff) | |
Switch SPIRV-Tools to use spirv.hpp11 internally (#4981)
Fixes #4960
* Switches to using enum classes with an underlying type to avoid
undefined behaviour
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 3a28b6630..bf9e580b4 100644 --- a/Android.mk +++ b/Android.mk @@ -220,7 +220,8 @@ $(1)/opencl.std.insts.inc \ --core-insts-output=$(1)/core.insts-unified1.inc \ --glsl-insts-output=$(1)/glsl.std.450.insts.inc \ --opencl-insts-output=$(1)/opencl.std.insts.inc \ - --operand-kinds-output=$(1)/operand.kinds-unified1.inc + --operand-kinds-output=$(1)/operand.kinds-unified1.inc \ + --output-language=c++ @echo "[$(TARGET_ARCH_ABI)] Grammar (from unified1) : instructions & operands <= grammar JSON files" $(LOCAL_PATH)/source/opcode.cpp: $(1)/core.insts-unified1.inc $(LOCAL_PATH)/source/operand.cpp: $(1)/operand.kinds-unified1.inc @@ -294,7 +295,8 @@ $(1)/extension_enum.inc $(1)/enum_string_mapping.inc: \ --extinst-debuginfo-grammar=$(SPV_DEBUGINFO_GRAMMAR) \ --extinst-cldebuginfo100-grammar=$(SPV_CLDEBUGINFO100_GRAMMAR) \ --extension-enum-output=$(1)/extension_enum.inc \ - --enum-string-mapping-output=$(1)/enum_string_mapping.inc + --enum-string-mapping-output=$(1)/enum_string_mapping.inc \ + --output-language=c++ @echo "[$(TARGET_ARCH_ABI)] Generate enum<->string mapping <= grammar JSON files" # Generated header extension_enum.inc is transitively included by table.h, which is # used pervasively. Capture the pervasive dependency. |