Re-sync with internal repository (#238)

The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging.
facebook · Feb 5, 2025 · 61c4ea5 · 61c4ea5
1 parent 5e9d9b5
commit 61c4ea5
Show file tree

Hide file tree

Showing 181 changed files with 806 additions and 806 deletions.
diff --git a/IGLU/imgui/Session.cpp b/IGLU/imgui/Session.cpp
@@ -145,9 +145,9 @@ static std::unique_ptr<igl::IShaderStages> getShaderStagesForBackend(igl::IDevic
                                                            &result);
     break;
   }
-  // @fb-only: 
-    // @fb-only: 
-    // @fb-only: 
+  // @fb-only
+    // @fb-only
+    // @fb-only
   case igl::BackendType::Metal: {
     return igl::ShaderStagesCreator::fromLibraryStringInput(
         device, metalShaderStr(), "vertex_main", "fragment_main", "", &result);
@@ -267,7 +267,7 @@ Session::Renderer::Renderer(igl::IDevice& device) {
     _material->cullMode = igl::CullMode::Disabled;
     _material->blendMode = iglu::material::BlendMode::Translucent();
 
-    // @fb-only: 
+    // @fb-only
     if (device.getBackendType() != igl::BackendType::Vulkan) {
       _material->shaderUniforms().setTexture("texture", _fontTexture.get(), _linearSampler);
     }
@@ -386,7 +386,7 @@ void Session::Renderer::renderDrawData(igl::IDevice& device,
         lastBoundTextureId = cmd.TextureId;
         auto* tex = reinterpret_cast<igl::ITexture*>(cmd.TextureId);
         if (isVulkan) {
-          // @fb-only: 
+          // @fb-only
           // Add Vulkan support for texture reflection info in ShaderUniforms so we don't need to
           // bind the texture directly
           cmdEncoder.bindTexture(0, igl::BindTarget::kFragment, tex);

diff --git a/IGLU/uniform/Encoder.cpp b/IGLU/uniform/Encoder.cpp
@@ -89,8 +89,8 @@ void Encoder::operator()(igl::IRenderCommandEncoder& encoder,
     encodeRenderUniform(encoder, bufferIndex, bindTarget, uniform, Alignment::Aligned);
   } else if (backendType_ == igl::BackendType::Vulkan) {
     IGL_DEBUG_ASSERT_NOT_IMPLEMENTED();
-  // @fb-only: 
-    // @fb-only: 
+  // @fb-only
+    // @fb-only
   } else {
     IGL_DEBUG_ASSERT_NOT_REACHED();
   }
@@ -113,8 +113,8 @@ void Encoder::operator()(igl::IComputeCommandEncoder& encoder,
     encodeAlignedCompute(encoder, bufferIndex, uniform);
   } else if (backendType_ == igl::BackendType::Vulkan) {
     IGL_DEBUG_ASSERT_NOT_IMPLEMENTED();
-  // @fb-only: 
-    // @fb-only: 
+  // @fb-only
+    // @fb-only
   }
 }
 

diff --git a/build/android/app/src/main/java/com/facebook/igl/sample/SampleActivity.java b/build/android/app/src/main/java/com/facebook/igl/sample/SampleActivity.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 package com.facebook.igl.shell;
 

diff --git a/build/android/app/src/main/java/com/facebook/igl/sample/SampleLib.java b/build/android/app/src/main/java/com/facebook/igl/sample/SampleLib.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 package com.facebook.igl.shell;
 
@@ -26,7 +26,7 @@ public static enum BackendFlavor {
     OpenGL_ES,
     Metal,
     Vulkan,
-    // @fb-only: 
+    // @fb-only
   }
 
   // Must match igl/DeviceFeatures.h

diff --git a/build/android/app/src/main/java/com/facebook/igl/sample/SampleView.java b/build/android/app/src/main/java/com/facebook/igl/sample/SampleView.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 package com.facebook.igl.shell;
 

diff --git a/build/android/app/src/main/java/com/facebook/igl/sample/VulkanView.java b/build/android/app/src/main/java/com/facebook/igl/sample/VulkanView.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 package com.facebook.igl.shell;
 

diff --git a/samples/android/opengl/java/com/facebook/igl/sample/SampleActivity.java b/samples/android/opengl/java/com/facebook/igl/sample/SampleActivity.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 package com.facebook.igl.sample.opengl;
 

diff --git a/samples/android/opengl/java/com/facebook/igl/sample/SampleView.java b/samples/android/opengl/java/com/facebook/igl/sample/SampleView.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 package com.facebook.igl.sample.opengl;
 

diff --git a/samples/android/opengl/jni/Jni.cpp b/samples/android/opengl/jni/Jni.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 #include <jni.h>
 

diff --git a/samples/android/opengl/jni/TinyRenderer.cpp b/samples/android/opengl/jni/TinyRenderer.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 #include <igl/samples/android/opengl/TinyRenderer.h>
 

diff --git a/samples/android/opengl/jni/TinyRenderer.h b/samples/android/opengl/jni/TinyRenderer.h
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 #pragma once
 

diff --git a/samples/android/vulkan/java/com/facebook/igl/sample/SampleActivity.java b/samples/android/vulkan/java/com/facebook/igl/sample/SampleActivity.java
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 package com.facebook.igl.sample.vulkan;
 

diff --git a/samples/android/vulkan/jni/Tiny.cpp b/samples/android/vulkan/jni/Tiny.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 #include <android/log.h>
 #include <android_native_app_glue.h>

diff --git a/samples/desktop/Tiny/Tiny.cpp b/samples/desktop/Tiny/Tiny.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
@@ -264,7 +264,7 @@ static void createRenderPipeline() {
   desc.targetDesc.colorAttachments.resize(kNumColorAttachments);
 
   for (auto i = 0; i < kNumColorAttachments; ++i) {
-    // @fb-only: 
+    // @fb-only
     if (framebuffer_->getColorAttachment(i)) {
       desc.targetDesc.colorAttachments[i].textureFormat =
           framebuffer_->getColorAttachment(i)->getFormat();

diff --git a/samples/desktop/Tiny/Tiny_Mesh.cpp b/samples/desktop/Tiny/Tiny_Mesh.cpp
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-// @fb-only: 
+// @fb-only
 
 #include <GLFW/glfw3.h>
 #include <cassert>
@@ -352,9 +352,9 @@ static void initIGL() {
     using namespace std::filesystem;
     path dir = current_path();
     // find IGLU somewhere above our current directory
-    // @fb-only: 
+    // @fb-only
     const char* contentFolder = "third-party/content/src/";
-    // @fb-only: 
+    // @fb-only
     while (dir != current_path().root_path() && !exists(dir / path(contentFolder))) {
       dir = dir.parent_path();
     }