From 8f32f6e72ef95e192e15659691890975e01450cc Mon Sep 17 00:00:00 2001 From: Haroon Qureshi Date: Sun, 26 Apr 2026 14:03:15 -0700 Subject: [PATCH] Rename enum values to match type name. PiperOrigin-RevId: 906014884 Change-Id: I0f37ab0a0a910724723fb9f7e477b64643ca05fc --- .../filament/filament/filament_platform_factory.cc | 6 +++--- src/experimental/filament/render_context_filament.h | 10 +++++----- src/experimental/platform/hal/renderer.cc | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/experimental/filament/filament/filament_platform_factory.cc b/src/experimental/filament/filament/filament_platform_factory.cc index 4b5483fc..a7dc9709 100644 --- a/src/experimental/filament/filament/filament_platform_factory.cc +++ b/src/experimental/filament/filament/filament_platform_factory.cc @@ -31,13 +31,13 @@ static filament::Engine::Backend ResolveBackend(int graphics_api) { #endif switch (graphics_api) { - case mjGFX_DEFAULT: + case mjGRAPHICS_API_DEFAULT: // Use the default based on the platform above. break; - case mjGFX_OPENGL: + case mjGRAPHICS_API_OPENGL: backend = filament::Engine::Backend::OPENGL; break; - case mjGFX_VULKAN: + case mjGRAPHICS_API_VULKAN: backend = filament::Engine::Backend::VULKAN; break; default: diff --git a/src/experimental/filament/render_context_filament.h b/src/experimental/filament/render_context_filament.h index 9db6554f..28183fec 100644 --- a/src/experimental/filament/render_context_filament.h +++ b/src/experimental/filament/render_context_filament.h @@ -29,11 +29,11 @@ extern "C" { // IMPORTANT: This API should still be considered experimental and is likely // change frequently. -typedef enum mjtGraphicsApi_ { // backend graphics API to use - mjGFX_DEFAULT = 0, // default based on platform - mjGFX_OPENGL, // OpenGL (desktop) - mjGFX_VULKAN // Vulkan -} mjtGraphicsApi; +typedef enum mjrGraphicsApi_ { // backend graphics API to use + mjGRAPHICS_API_DEFAULT = 0, // default based on platform + mjGRAPHICS_API_OPENGL, // OpenGL (desktop) / WebGL + mjGRAPHICS_API_VULKAN // Vulkan +} mjrGraphicsApi; struct mjrFilamentConfig { // The native window handle into which we can render directly. diff --git a/src/experimental/platform/hal/renderer.cc b/src/experimental/platform/hal/renderer.cc index 2dc60e18..a023c54e 100644 --- a/src/experimental/platform/hal/renderer.cc +++ b/src/experimental/platform/hal/renderer.cc @@ -90,8 +90,9 @@ void Renderer::Init(const mjModel* model) { render_config.width = model->vis.global.offwidth; render_config.height = model->vis.global.offheight; render_config.force_software_rendering = IsSoftware(gfx_); - render_config.graphics_api = - IsOpenGl(gfx_) || IsWebGl(gfx_) ? mjGFX_OPENGL : mjGFX_VULKAN; + render_config.graphics_api = IsOpenGl(gfx_) || IsWebGl(gfx_) + ? mjGRAPHICS_API_OPENGL + : mjGRAPHICS_API_VULKAN; mjrf_makeFilamentContext(model, &render_context_, &render_config); render_ = [&](mjrRect rect, mjvScene* scene) { mjrf_render(rect, scene, &render_context_);