From 3d13d43c9c707461e45fc4aedda27b98c937c70f Mon Sep 17 00:00:00 2001
From: Haroon Qureshi <haroonq@google.com>
Date: Thu, 23 Apr 2026 07:53:08 -0700
Subject: [PATCH] Rename types to conform to mjr naming conventions.

PiperOrigin-RevId: 904456797
Change-Id: I759b1430a43c7072ed9750d084679d02f0c9cb6e
---
 .../filament/filament/mjr_filament_renderer.cc            | 8 ++++----
 src/experimental/filament/filament/render_target.cc       | 4 ++--
 src/experimental/filament/filament/render_target.h        | 8 ++++----
 src/experimental/filament/filament/scene_view.cc          | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/experimental/filament/filament/mjr_filament_renderer.cc b/src/experimental/filament/filament/mjr_filament_renderer.cc
index 5e1112c8..8ca1ebe6 100644
--- a/src/experimental/filament/filament/mjr_filament_renderer.cc
+++ b/src/experimental/filament/filament/mjr_filament_renderer.cc
@@ -130,8 +130,8 @@ void MjrFilamentRenderer::ReadPixels(mjrRect viewport, unsigned char* rgb,
   render_requests_[1].height = viewport.height;
 
   if (rgb) {
-    RenderTargetConfig config;
-    DefaultRenderTargetConfig(&config);
+    mjrRenderTargetConfig config;
+    mjr_defaultRenderTargetConfig(&config);
     config.color_format = mjPIXEL_FORMAT_RGB8;
     config.depth_format = mjPIXEL_FORMAT_DEPTH32F;
     auto target = std::make_unique<RenderTarget>(GetEngine(), config);
@@ -154,8 +154,8 @@ void MjrFilamentRenderer::ReadPixels(mjrRect viewport, unsigned char* rgb,
   }
 
   if (depth) {
-    RenderTargetConfig config;
-    DefaultRenderTargetConfig(&config);
+    mjrRenderTargetConfig config;
+    mjr_defaultRenderTargetConfig(&config);
     config.color_format = mjPIXEL_FORMAT_R32F;
     config.depth_format = mjPIXEL_FORMAT_DEPTH32F;
     auto target = std::make_unique<RenderTarget>(GetEngine(), config);
diff --git a/src/experimental/filament/filament/render_target.cc b/src/experimental/filament/filament/render_target.cc
index 4ebd7adf..3e53ac51 100644
--- a/src/experimental/filament/filament/render_target.cc
+++ b/src/experimental/filament/filament/render_target.cc
@@ -30,13 +30,13 @@
 
 namespace mujoco {
 
-void DefaultRenderTargetConfig(RenderTargetConfig* config) {
+void mjr_defaultRenderTargetConfig(mjrRenderTargetConfig* config) {
   config->color_format = mjPIXEL_FORMAT_RGBA8;
   config->depth_format = mjPIXEL_FORMAT_DEPTH32F;
 }
 
 RenderTarget::RenderTarget(filament::Engine* engine,
-                           const RenderTargetConfig& config)
+                           const mjrRenderTargetConfig& config)
     : engine_(engine), config_(config) {}
 
 RenderTarget::~RenderTarget() noexcept {
diff --git a/src/experimental/filament/filament/render_target.h b/src/experimental/filament/filament/render_target.h
index 1ab77c0d..b731a567 100644
--- a/src/experimental/filament/filament/render_target.h
+++ b/src/experimental/filament/filament/render_target.h
@@ -26,20 +26,20 @@
 namespace mujoco {
 
 // Defines the basic properties of a render target.
-struct RenderTargetConfig {
+struct mjrRenderTargetConfig {
   mjrPixelFormat color_format;
   mjrPixelFormat depth_format;
 };
 
 // Initializes the RenderTargetConfig to default values.
-void DefaultRenderTargetConfig(RenderTargetConfig* config);
+void mjr_defaultRenderTargetConfig(mjrRenderTargetConfig* config);
 
 // Manages a filament RenderTarget and the textures which are bound to it.
 class RenderTarget {
  public:
   // Defines the types of textures to create for the color and depth
   // attachments.
-  RenderTarget(filament::Engine* engine, const RenderTargetConfig& config);
+  RenderTarget(filament::Engine* engine, const mjrRenderTargetConfig& config);
   ~RenderTarget() noexcept;
 
   RenderTarget(const RenderTarget&) = delete;
@@ -66,7 +66,7 @@ class RenderTarget {
   void Destroy();
 
   filament::Engine* engine_ = nullptr;
-  RenderTargetConfig config_;
+  mjrRenderTargetConfig config_;
   filament::RenderTarget* render_target_ = nullptr;
   std::unique_ptr<Texture> color_texture_ = nullptr;
   std::unique_ptr<Texture> depth_texture_ = nullptr;
diff --git a/src/experimental/filament/filament/scene_view.cc b/src/experimental/filament/filament/scene_view.cc
index eb2bb47c..ee06e464 100644
--- a/src/experimental/filament/filament/scene_view.cc
+++ b/src/experimental/filament/filament/scene_view.cc
@@ -286,8 +286,8 @@ void SceneView::AddReflectiveRenderable(Renderable* renderable) {
   // Ensure we have the same number of render targets as we do reflective
   // renderables.
   while (reflect_targets_.size() < reflectives_.size()) {
-    RenderTargetConfig config;
-    DefaultRenderTargetConfig(&config);
+    mjrRenderTargetConfig config;
+    mjr_defaultRenderTargetConfig(&config);
 
     config.color_format = mjPIXEL_FORMAT_RGBA8;
     config.depth_format = mjPIXEL_FORMAT_DEPTH32F;