From 075cc13119eaddbf05bb41e9c2cb84df0017b432 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 16 Dec 2024 09:58:42 +0100 Subject: [PATCH] GPU: Missing create info when running tests When running tests `WITH_GTESTS` and `WITH_GPU_DRAW_TESTS` the GPUShaderCreateInfo's specfically created for the tests could not be found. This failed running tests on any backend. This PR fixes this. The root cause what that the name of the compile directive was incorrect. It should have been `WITH_GTESTS` but was `WITH_GTEST`. Pull Request: https://projects.blender.org/blender/blender/pulls/131956 --- source/blender/gpu/CMakeLists.txt | 4 ++-- source/blender/gpu/intern/gpu_shader_create_info_list.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 68040e6996f..042c9998490 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -739,8 +739,8 @@ if(WITH_GPU_DRAW_TESTS) add_definitions(-DWITH_GPU_DRAW_TESTS) endif() -if(WITH_GTEST) - add_definitions(-DWITH_GTEST) +if(WITH_GTESTS) + add_definitions(-DWITH_GTESTS) endif() blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/gpu/intern/gpu_shader_create_info_list.hh b/source/blender/gpu/intern/gpu_shader_create_info_list.hh index 0bf3878e5fa..160e77247c1 100644 --- a/source/blender/gpu/intern/gpu_shader_create_info_list.hh +++ b/source/blender/gpu/intern/gpu_shader_create_info_list.hh @@ -38,7 +38,7 @@ #include "gpu_shader_text_info.hh" #include "gpu_srgb_to_framebuffer_space_info.hh" -#ifdef WITH_GTEST +#ifdef WITH_GTESTS # ifdef WITH_GPU_DRAW_TESTS # include "gpu_shader_test_info.hh" # endif