Skip to content

Commit 0449c7c

Browse files
committed
Runtime shader compilation bootstrap has complete.
Changes to be committed: modified: CMakeLists.txt modified: inc/ae2f/Ann/Act.h deleted: src/vk/Slp.glsl renamed: src/vk/Slp.def.cc -> src/vk/Slp.inc.cc new file: src/vk/glsl/Slp.glsl new file: src/vk/glsl/mac.h modified: test/vk/SlpInit-Primal.c
1 parent 9e75481 commit 0449c7c

File tree

7 files changed

+558
-79
lines changed

7 files changed

+558
-79
lines changed

CMakeLists.txt

Lines changed: 45 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.20)
22
enable_testing()
33
option(ae2f_CXX "" ON)
44
option(ae2fVK_needed "" OFF)
5+
option(ae2fVK_need_glslang "" OFF)
56
option(ae2f_TEST "" ON)
67
option(ae2f_MAC_BUILD "" ON)
78
option(ae2f_IS_SHARED "" OFF)
@@ -70,11 +71,54 @@ if(ae2fVK_needed AND NOT TARGET ae2fVK::Ann)
7071
file(GLOB AnnVK-inc ${PROJECT_SOURCE_DIR}/inc/ae2fVK/Ann/*.h)
7172

7273
if(ae2f_DEVEL)
73-
file(GLOB_RECURSE AnnVK-src ${PROJECT_SOURCE_DIR}/src/vk/*.def.c*)
74+
file(GLOB_RECURSE AnnVK-src ${PROJECT_SOURCE_DIR}/src/vk/*.inc.c*)
7475
else()
7576
set(AnnVK-src "")
7677
endif()
7778

79+
ae2f_Inc_init(
80+
100 100 100 ON ON ON
81+
"-DINC_LEAVE_NFOUND=OFF"
82+
)
83+
84+
get_target_property(Core_INCLUDE_DIRS ae2f::Core INCLUDE_DIRECTORIES)
85+
message("Dir: ${Core_INCLUDE_DIRS}/")
86+
87+
ae2f_FileRaw_init(ON 1)
88+
89+
if(OFF)
90+
ae2f_Macro_one(
91+
${PROJECT_SOURCE_DIR}/src/vk/glsl/Slp.glsl
92+
${PROJECT_SOURCE_DIR}/src/vk/glsl/Slp.auto.glsl.i
93+
)
94+
endif()
95+
96+
if(OFF)
97+
ae2f_Inc_Run_One(
98+
${PROJECT_SOURCE_DIR}/src/vk/glsl/Slp.auto.glsl.i
99+
${PROJECT_SOURCE_DIR}/src/vk/glsl/Slp.auto.glsl
100+
"${Core_INCLUDE_DIRS}/"
101+
)
102+
endif()
103+
104+
if(ON)
105+
ae2f_FileRaw_Run_One(
106+
${PROJECT_SOURCE_DIR}/src/vk/glsl/Slp.glsl
107+
${PROJECT_SOURCE_DIR}/src/vk/glsl/Slp.auto.glsl.impl
108+
)
109+
endif()
110+
111+
112+
ae2f_Inc_init(
113+
100 100 100 ON ON ON
114+
"-DINC_LEAVE_NFOUND=ON"
115+
)
116+
117+
ae2f_Inc_Run_One(
118+
${PROJECT_SOURCE_DIR}/src/vk/Slp.inc.cc
119+
${PROJECT_SOURCE_DIR}/src/vk/Slp.auto.def.cc
120+
)
121+
78122
ae2f_Macro_Lib_V(
79123
ae2fVK VK-Ann "${ae2f_LIBPREFIX}"
80124
${PROJECT_SOURCE_DIR}/src/vk "*.imp.c"
@@ -84,17 +128,6 @@ if(ae2fVK_needed AND NOT TARGET ae2fVK::Ann)
84128
${AnnVK-inc} ${AnnVK-src}
85129
)
86130

87-
ae2f_Inc_init(100 100 100 ON ON ON)
88-
ae2f_Macro_one(
89-
${PROJECT_SOURCE_DIR}/src/vk/Slp.glsl
90-
${PROJECT_SOURCE_DIR}/src/vk/Slp.auto.i.glsl
91-
)
92-
ae2f_Inc_Run_One(
93-
${PROJECT_SOURCE_DIR}/src/vk/Slp.auto.i.glsl
94-
${PROJECT_SOURCE_DIR}/src/vk/Slp.auto.glsl
95-
)
96-
97-
98131
add_library(ae2fVK::Ann ALIAS ${ae2fVK__VK-Ann__TENT})
99132
add_library(ae2f::VK-Ann ALIAS ${ae2fVK__VK-Ann__TENT})
100133

inc/ae2f/Ann/Act.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define ae2fCL_AnnAct_h
1414

1515
#include <stddef.h>
16-
#include <ae2f/Float.auto.h>
16+
#include <ae2f/Float.h>
1717

1818
/// @brief Customisable activasion function type.
1919
typedef ae2f_float_t ae2f_AnnAct_t (ae2f_float_t x);

src/vk/Slp.glsl

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)