Remove separate targets for classic and filament renderer.
The platform::Renderer now supports both implementations at runtime. PiperOrigin-RevId: 878427862 Change-Id: I2997c197c6eddbe177c77b435cc5848fd80f1839
This commit is contained in:
committed by
Copybara-Service
parent
84682a46b0
commit
13d164063c
@@ -16,25 +16,8 @@ cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
set(MUJOCO_PLATFORM_TARGET_NAME mujoco_platform)
|
||||
|
||||
# Determine the render configuration and dependencies based options.
|
||||
if(MUJOCO_USE_FILAMENT AND MUJOCO_USE_FILAMENT_VULKAN)
|
||||
set(MUJOCO_PLATFORM_RENDER_CONFIG "MUJOCO_RENDERER_FILAMENT_VULKAN")
|
||||
set(MUJOCO_PLATFORM_RENDER_DEPS "mujoco::filament")
|
||||
elseif(MUJOCO_USE_FILAMENT)
|
||||
set(MUJOCO_PLATFORM_RENDER_CONFIG "MUJOCO_RENDERER_FILAMENT_OPENGL")
|
||||
set(MUJOCO_PLATFORM_RENDER_DEPS "mujoco::filament")
|
||||
else()
|
||||
set(MUJOCO_PLATFORM_RENDER_CONFIG "MUJOCO_RENDERER_CLASSIC_OPENGL")
|
||||
set(MUJOCO_PLATFORM_RENDER_DEPS "dear_imgui_OpenGL3")
|
||||
endif()
|
||||
|
||||
add_library(${MUJOCO_PLATFORM_TARGET_NAME} STATIC)
|
||||
|
||||
target_compile_definitions(${MUJOCO_PLATFORM_TARGET_NAME}
|
||||
PUBLIC
|
||||
-D${MUJOCO_PLATFORM_RENDER_CONFIG}
|
||||
)
|
||||
|
||||
target_sources(${MUJOCO_PLATFORM_TARGET_NAME}
|
||||
PUBLIC
|
||||
egl_utils.cc
|
||||
@@ -113,8 +96,10 @@ include(third_party_deps/libwebp)
|
||||
target_link_libraries(${MUJOCO_PLATFORM_TARGET_NAME}
|
||||
dear_imgui
|
||||
dear_imgui_SDL2
|
||||
dear_imgui_OpenGL3
|
||||
dear_imgui_stdlib
|
||||
implot
|
||||
mujoco::filament
|
||||
webp
|
||||
SDL2::SDL2-static
|
||||
${MUJOCO_PLATFORM_RENDER_DEPS}
|
||||
|
||||
Reference in New Issue
Block a user