summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhys Perry <pendingchaos02@gmail.com>2020-10-12 14:44:36 +0100
committerEric Engestrom <eric@engestrom.ch>2020-10-14 19:29:34 +0200
commit36dc0d83552281802cdf39b424f217b348956df2 (patch)
tree06abd410549dd56e75777ddfc460f127f30c78c2
parent7bf69260cd077a88690276d6ebe4864d0798c410 (diff)
android: fix SPIR-V -> NIR build
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com> Reviewed-by: Mauro Rossi <issor.oruam@gmail.com> Fixes: 18f9fc919e1 ('spirv: add and use a generator id enum') Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7097> (cherry picked from commit 1070bba19e26640bc1dbfd04180e97217761404d)
-rw-r--r--.pick_status.json2
-rw-r--r--src/compiler/Android.nir.gen.mk5
-rw-r--r--src/compiler/Makefile.sources3
-rw-r--r--src/compiler/spirv/vtn_generator_ids_h.py2
4 files changed, 9 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json
index b1f547945f4..112b9f0c290 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5584,7 +5584,7 @@
"description": "android: fix SPIR-V -> NIR build",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "18f9fc919e1b5e7511cc3085dd990b7ca037f38e"
},
diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk
index e753bb77ad1..2d2f7724c4e 100644
--- a/src/compiler/Android.nir.gen.mk
+++ b/src/compiler/Android.nir.gen.mk
@@ -33,6 +33,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
LOCAL_C_INCLUDES += \
$(intermediates)/nir \
+ $(intermediates)/spirv \
$(MESA_TOP)/src/compiler/nir
LOCAL_EXPORT_C_INCLUDE_DIRS += \
@@ -103,6 +104,10 @@ $(intermediates)/spirv/vtn_gather_types.c:: $(LOCAL_PATH)/spirv/vtn_gather_types
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false)
+$(intermediates)/spirv/vtn_generator_ids.h:: $(LOCAL_PATH)/spirv/vtn_generator_ids_h.py $(LOCAL_PATH)/spirv/spir-v.xml
+ @mkdir -p $(dir $@)
+ $(hide) $(MESA_PYTHON2) $^ $@ || ($(RM) $@; false)
+
nir_intrinsics_h_gen := $(LOCAL_PATH)/nir/nir_intrinsics_h.py
$(intermediates)/nir/nir_intrinsics.h: $(LOCAL_PATH)/nir/nir_intrinsics.py $(nir_intrinsics_h_gen)
@mkdir -p $(dir $@)
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources
index 6a400677529..bcc336b9b22 100644
--- a/src/compiler/Makefile.sources
+++ b/src/compiler/Makefile.sources
@@ -356,7 +356,8 @@ NIR_FILES = \
SPIRV_GENERATED_FILES = \
spirv/spirv_info.c \
- spirv/vtn_gather_types.c
+ spirv/vtn_gather_types.c \
+ spirv/vtn_generator_ids.h
SPIRV_FILES = \
spirv/GLSL.ext.AMD.h \
diff --git a/src/compiler/spirv/vtn_generator_ids_h.py b/src/compiler/spirv/vtn_generator_ids_h.py
index 098c7d80d85..7d6c57f186e 100644
--- a/src/compiler/spirv/vtn_generator_ids_h.py
+++ b/src/compiler/spirv/vtn_generator_ids_h.py
@@ -1,6 +1,6 @@
COPYRIGHT = """\
/*
- * Copyright © 2020 Valve Corporation
+ * Copyright (C) 2020 Valve Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),