android: fix SPIR-V -> NIR build
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Mauro Rossi <issor.oruam@gmail.com>
Fixes: 18f9fc919e
('spirv: add and use a generator id enum')
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7097>
This commit is contained in:
parent
86ededf296
commit
1070bba19e
|
@ -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 $@)
|
||||
|
|
|
@ -370,7 +370,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 \
|
||||
|
|
|
@ -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"),
|
||||
|
|
Loading…
Reference in New Issue