GPU: Remove the Word OpenGL from Build Scripts

The build scripts are still referring to gpu tests as being opengl.
Although they can also use Metal or Vulkan. This PR only replaces
the work `opengl` with `gpu` for build options.

Special note is that the windows argument `with_opengl_tests` is
also replaced with `with_gpu_tests` for consistency.

Pull Request: https://projects.blender.org/blender/blender/pulls/116030
This commit is contained in:
Jeroen Bakker
2023-12-12 16:02:29 +01:00
parent e503536775
commit c11004579e
8 changed files with 18 additions and 18 deletions
+2 -2
View File
@@ -760,8 +760,8 @@ endif()
# Unit testing
option(WITH_GTESTS "Enable GTest unit testing" OFF)
option(WITH_OPENGL_RENDER_TESTS "Enable OpenGL render related unit testing (Experimental)" OFF)
option(WITH_OPENGL_DRAW_TESTS "Enable OpenGL UI drawing related unit testing (Experimental)" OFF)
option(WITH_GPU_RENDER_TESTS "Enable GPU render related unit testing (EEVEE, Workbench and Grease Pencil)" OFF)
option(WITH_GPU_DRAW_TESTS "Enable GPU drawing related unit testing (GPU backends and draw manager)" OFF)
option(WITH_COMPOSITOR_REALTIME_TESTS "Enable regression testing for realtime compositor" OFF)
if(UNIX AND NOT (APPLE OR HAIKU))
option(WITH_UI_TESTS "\
+2 -2
View File
@@ -17,8 +17,8 @@ if NOT "%1" == "" (
shift /1
) else if "%1" == "with_tests" (
set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_GTESTS=On
) else if "%1" == "with_opengl_tests" (
set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_OPENGL_DRAW_TESTS=On -DWITH_OPENGL_RENDER_TESTS=On
) else if "%1" == "with_gpu_tests" (
set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_GPU_DRAW_TESTS=On -DWITH_GPU_RENDER_TESTS=On
) else if "%1" == "full" (
set TARGET=Full
set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
+1 -1
View File
@@ -37,7 +37,7 @@ echo - doc_py ^(Generate sphinx python api docs^)
echo.
echo Experimental options
echo - with_opengl_tests ^(enable both the render and draw opengl test suites^)
echo - with_gpu_tests ^(enable both the render and draw gpu test suites including EEVEE, Workbench, Grease Pencil, draw manager and GPU backends^)
echo - clang ^(enable building with clang^)
echo - asan ^(enable asan when building with clang^)
echo - ninja ^(enable building with ninja instead of msbuild^)
+3 -3
View File
@@ -928,8 +928,8 @@ if(WITH_XR_OPENXR)
endif()
if(WITH_GTESTS)
if(WITH_OPENGL_DRAW_TESTS)
add_definitions(-DWITH_OPENGL_DRAW_TESTS)
if(WITH_GPU_DRAW_TESTS)
add_definitions(-DWITH_GPU_DRAW_TESTS)
if(WITH_OPENGL_BACKEND)
add_definitions(-DWITH_OPENGL_BACKEND)
endif()
@@ -964,7 +964,7 @@ blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
if(WITH_GTESTS)
if(WITH_OPENGL_DRAW_TESTS)
if(WITH_GPU_DRAW_TESTS)
set(TEST_SRC
tests/draw_pass_test.cc
tests/draw_testing.cc
+1 -1
View File
@@ -3374,7 +3374,7 @@ void DRW_xr_drawing_end()
/** \name Internal testing API for gtests
* \{ */
#ifdef WITH_OPENGL_DRAW_TESTS
#ifdef WITH_GPU_DRAW_TESTS
void DRW_draw_state_init_gtests(eGPUShaderConfig sh_cfg)
{
@@ -16,7 +16,7 @@
extern "C" {
#endif
#ifdef WITH_OPENGL_DRAW_TESTS
#ifdef WITH_GPU_DRAW_TESTS
void DRW_draw_state_init_gtests(eGPUShaderConfig sh_cfg);
#endif
+4 -4
View File
@@ -626,7 +626,7 @@ set(MSL_SRC
)
if(WITH_GTESTS)
if(WITH_OPENGL_DRAW_TESTS)
if(WITH_GPU_DRAW_TESTS)
list(APPEND GLSL_SRC ${GLSL_SRC_TEST})
endif()
endif()
@@ -775,7 +775,7 @@ set(SRC_SHADER_CREATE_INFOS_MTL
)
if(WITH_GTESTS)
if(WITH_OPENGL_DRAW_TESTS)
if(WITH_GPU_DRAW_TESTS)
list(APPEND SRC_SHADER_CREATE_INFOS ${SRC_SHADER_CREATE_INFOS_TEST})
endif()
endif()
@@ -884,7 +884,7 @@ if(WITH_GTESTS)
set(TEST_INC)
set(TEST_LIB)
if(WITH_OPENGL_DRAW_TESTS)
if(WITH_GPU_DRAW_TESTS)
list(APPEND TEST_SRC
tests/buffer_texture_test.cc
tests/compute_test.cc
@@ -909,7 +909,7 @@ if(WITH_GTESTS)
endif()
# Enable shader validation on buildbot for Metal
if(WITH_METAL_BACKEND AND NOT WITH_OPENGL_DRAW_TESTS)
if(WITH_METAL_BACKEND AND NOT WITH_GPU_DRAW_TESTS)
list(APPEND TEST_SRC
tests/shader_create_info_test.cc
)
+4 -4
View File
@@ -602,7 +602,7 @@ if(TRUE)
endif()
endif()
if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
if(WITH_CYCLES OR WITH_GPU_RENDER_TESTS)
if(NOT OPENIMAGEIO_IDIFF)
message(WARNING "Disabling render tests because OIIO idiff does not exist")
elseif(NOT EXISTS "${TEST_SRC_DIR}/render/shader")
@@ -657,7 +657,7 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
# list(APPEND render_tests guiding)
#endif()
if(WITH_OPENGL_RENDER_TESTS)
if(WITH_GPU_RENDER_TESTS)
list(APPEND render_tests grease_pencil)
endif()
@@ -693,7 +693,7 @@ if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
unset(_cycles_blacklist)
endif()
if(WITH_OPENGL_RENDER_TESTS)
if(WITH_GPU_RENDER_TESTS)
# Eevee
foreach(render_test ${render_tests})
add_render_test(
@@ -874,7 +874,7 @@ else()
endif()
if(WITH_OPENGL_DRAW_TESTS)
if(WITH_GPU_DRAW_TESTS)
if(NOT OPENIMAGEIO_IDIFF)
message(STATUS "Disabling OpenGL draw tests because OIIO idiff does not exist")
elseif(NOT EXISTS "${TEST_SRC_DIR}/opengl")