diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2021-11-24 22:09:36 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2021-11-24 22:09:36 +0300 |
| commit | a590474f4c8bee7321b8882e4dde9d46def53d22 (patch) | |
| tree | ac4a3973e717f41cb1988c25a5f5744b390908f1 | |
| parent | b2462b6f5c9e352cbb2d9bbb4e75993a1ec320e5 (diff) | |
Fix compilation & dependency depth
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_dependency.cc | 5 | ||||
| -rw-r--r-- | source/blender/gpu/shaders/gpu_shader_3D_flat_color.desc.h | 7 |
3 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index d2b510c8ff8..5338adfe093 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -459,6 +459,10 @@ if(WITH_IMAGE_DDS) endif() blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") +target_link_libraries(bf_gpu PUBLIC + bf_draw_shaders + bf_gpu_shaders +) if(CXX_WARN_NO_SUGGEST_OVERRIDE) target_compile_options(bf_gpu PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wsuggest-override>) diff --git a/source/blender/gpu/intern/gpu_shader_dependency.cc b/source/blender/gpu/intern/gpu_shader_dependency.cc index 21e48af04e5..995fe8f805f 100644 --- a/source/blender/gpu/intern/gpu_shader_dependency.cc +++ b/source/blender/gpu/intern/gpu_shader_dependency.cc @@ -82,9 +82,10 @@ struct GPUSource { /* Recursive. */ source->init_dependencies(dict); - std::cout << "Add: " << dependency_name << " to " << filename << "." << std::endl; + for (auto dep : source->dependencies) { + dependencies.add(dep); + } dependencies.add(source); - pos++; }; } diff --git a/source/blender/gpu/shaders/gpu_shader_3D_flat_color.desc.h b/source/blender/gpu/shaders/gpu_shader_3D_flat_color.desc.h index 7435925912b..16eeeec204c 100644 --- a/source/blender/gpu/shaders/gpu_shader_3D_flat_color.desc.h +++ b/source/blender/gpu/shaders/gpu_shader_3D_flat_color.desc.h @@ -21,13 +21,6 @@ GPU_SHADER_DESCRIPTOR(gpu_shader_3D_flat_color, { [0] = FRAGMENT_OUTPUT(VEC4, "fragColor"), }, - .resources = - { - [DESCRIPTOR_SET_0] = - { - // [0] = common->matrix_stack_block, - }, - }, .push_constants = { [1] = PUSH_CONSTANT(BOOL, "srgbTarget"), |