diff --git a/IGLU/imgui/Session.cpp b/IGLU/imgui/Session.cpp index c2657b78502..feb0ec22687 100644 --- a/IGLU/imgui/Session.cpp +++ b/IGLU/imgui/Session.cpp @@ -145,9 +145,9 @@ static std::unique_ptr 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(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 index 6966174fe27..ab30ca81d7d 100644 --- 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 index 996d406bded..fd8c399d560 100644 --- 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 index 04627998e59..584b4db8d6e 100644 --- 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 index 7e80b94d2ae..77f87cdfe1b 100644 --- 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 index f507b487c11..a97d9687a7b 100644 --- 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 index e8a24ca4948..13c5c840c2d 100644 --- 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 index 8cb6a614f96..0031808c1c8 100644 --- 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 index 2da9b627e97..71df14368a0 100644 --- 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 diff --git a/samples/android/opengl/jni/TinyRenderer.cpp b/samples/android/opengl/jni/TinyRenderer.cpp index 5996bae0ec2..2bbd6ec4d95 100644 --- 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 diff --git a/samples/android/opengl/jni/TinyRenderer.h b/samples/android/opengl/jni/TinyRenderer.h index 11ad592bf41..6ba3d4ff1e2 100644 --- 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 index de0ecba4fc6..9efe62d80fc 100644 --- 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 index 818b7f8473c..dac1329c606 100644 --- 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 #include diff --git a/samples/desktop/Tiny/Tiny.cpp b/samples/desktop/Tiny/Tiny.cpp index e992efb09b0..83444ed5e43 100644 --- 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 @@ -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 index 88966582d44..0e7685bcf7e 100644 --- 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 #include @@ -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(); } diff --git a/samples/desktop/Tiny/Tiny_MeshLarge.cpp b/samples/desktop/Tiny/Tiny_MeshLarge.cpp index fb4f69c617b..cba0bdfcae0 100644 --- a/samples/desktop/Tiny/Tiny_MeshLarge.cpp +++ b/samples/desktop/Tiny/Tiny_MeshLarge.cpp @@ -14,7 +14,7 @@ * */ -// @fb-only: +// @fb-only #if !defined(_USE_MATH_DEFINES) #define _USE_MATH_DEFINES @@ -112,21 +112,21 @@ #include #include -// @fb-only: - -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only + +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only #if IGL_WITH_IGLU #include @@ -641,9 +641,9 @@ void main() { } )"; -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only using namespace igl; using glm::mat4; @@ -1001,10 +1001,10 @@ void initIGL() { IGL_DEBUG_ASSERT(device_); } } -// @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only +// @fb-only { const TextureDesc desc = TextureDesc::new2D(igl::TextureFormat::RGBA_UNorm8, @@ -1467,49 +1467,49 @@ void createRenderPipelines() { desc.vertexInputState = vertexInput0_; -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only #if USE_OPENGL_BACKEND std::string vsCode = std::string("#version 460") + kCodeVS; kCodeVS = vsCode.c_str(); @@ -1524,7 +1524,7 @@ void createRenderPipelines() { "main", "Shader Module: main (frag)", nullptr); -// @fb-only: +// @fb-only #if USE_OPENGL_BACKEND desc.uniformBlockBindingMap.emplace( 0, @@ -1659,47 +1659,47 @@ void createRenderPipelineSkybox() { desc.targetDesc.depthAttachmentFormat = fbMain_->getDepthAttachment()->getFormat(); } -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only #if USE_OPENGL_BACKEND std::string vsCode = std::string("#version 460") + kSkyboxVS; stringReplaceAll(vsCode, "gl_VertexIndex", "gl_VertexID"); @@ -1715,7 +1715,7 @@ void createRenderPipelineSkybox() { "main", "Shader Module: skybox (frag)", nullptr); -// @fb-only: +// @fb-only #if USE_OPENGL_BACKEND size_t bindingPoint = 0; desc.uniformBlockBindingMap[bindingPoint++].emplace_back( @@ -2583,7 +2583,7 @@ int main(int /*argc*/, char* /*argv*/[]) { { using namespace std::filesystem; path subdir("third-party/content/"); - // @fb-only: + // @fb-only path dir = current_path(); // find the content somewhere above our current build directory while (dir != current_path().root_path() && !exists(dir / subdir)) { diff --git a/samples/ios/snapshot_test_support/TinyRenderable.cpp b/samples/ios/snapshot_test_support/TinyRenderable.cpp index e5b51abdaf7..349aea00321 100644 --- a/samples/ios/snapshot_test_support/TinyRenderable.cpp +++ b/samples/ios/snapshot_test_support/TinyRenderable.cpp @@ -109,9 +109,9 @@ std::unique_ptr getShaderStagesForBackend(igl::IDevice& devi case igl::BackendType::Vulkan: IGL_DEBUG_ABORT("IGLSamples not set up for Vulkan"); return nullptr; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: { igl::Result result; auto stages = igl::ShaderStagesCreator::fromLibraryStringInput( diff --git a/samples/wasm/Common.cpp b/samples/wasm/Common.cpp index bac350ec448..ec6afb4556c 100644 --- a/samples/wasm/Common.cpp +++ b/samples/wasm/Common.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "Common.h" diff --git a/samples/wasm/Tiny_Mesh.cpp b/samples/wasm/Tiny_Mesh.cpp index f5b78e4d358..00123b49a48 100644 --- a/samples/wasm/Tiny_Mesh.cpp +++ b/samples/wasm/Tiny_Mesh.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/samples/wasm/Triangle.cpp b/samples/wasm/Triangle.cpp index 69a1b8996b3..25845f63742 100644 --- a/samples/wasm/Triangle.cpp +++ b/samples/wasm/Triangle.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #ifndef __EMSCRIPTEN__ #error Unsupported OS diff --git a/shell/android/java/com/facebook/igl/sample/SampleActivity.java b/shell/android/java/com/facebook/igl/sample/SampleActivity.java index 996d406bded..fd8c399d560 100644 --- a/shell/android/java/com/facebook/igl/sample/SampleActivity.java +++ b/shell/android/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/shell/android/java/com/facebook/igl/sample/SampleLib.java b/shell/android/java/com/facebook/igl/sample/SampleLib.java index 04551da37c4..dcad5759340 100644 --- a/shell/android/java/com/facebook/igl/sample/SampleLib.java +++ b/shell/android/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/shell/android/java/com/facebook/igl/sample/SampleView.java b/shell/android/java/com/facebook/igl/sample/SampleView.java index f5528ceaf74..bd4b8189641 100644 --- a/shell/android/java/com/facebook/igl/sample/SampleView.java +++ b/shell/android/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/shell/android/java/com/facebook/igl/sample/VulkanView.java b/shell/android/java/com/facebook/igl/sample/VulkanView.java index f507b487c11..a97d9687a7b 100644 --- a/shell/android/java/com/facebook/igl/sample/VulkanView.java +++ b/shell/android/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/shell/android/jni/Jni.cpp b/shell/android/jni/Jni.cpp index 84edfce2468..9f5cee01108 100644 --- a/shell/android/jni/Jni.cpp +++ b/shell/android/jni/Jni.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "TinyRenderer.h" #include @@ -41,9 +41,9 @@ namespace { case BackendFlavor::Vulkan: str = "Vulkan"; break; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only } str += " " + std::to_string(static_cast(backendVersion->majorVersion)) + " " + diff --git a/shell/android/jni/TinyRenderer.cpp b/shell/android/jni/TinyRenderer.cpp index d1a36d7d1d2..210ad5118f2 100644 --- a/shell/android/jni/TinyRenderer.cpp +++ b/shell/android/jni/TinyRenderer.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "TinyRenderer.h" diff --git a/shell/ios/AppDelegate.h b/shell/ios/AppDelegate.h index d9b9b31b603..0bc3da7bbc5 100644 --- a/shell/ios/AppDelegate.h +++ b/shell/ios/AppDelegate.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import diff --git a/shell/ios/AppDelegate.mm b/shell/ios/AppDelegate.mm index ab98cccf166..4f428ea044f 100644 --- a/shell/ios/AppDelegate.mm +++ b/shell/ios/AppDelegate.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "AppDelegate.h" @@ -65,17 +65,17 @@ - (BOOL)application:(UIApplication*)application .depthTextureFormat = igl::TextureFormat::S8_UInt_Z24_UNorm, }, #endif -// @fb-only: +// @fb-only // clang-format off - // @fb-only: + // @fb-only // clang-format on - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only }; const auto requestedSessionConfigs = factoryProvider_.adapter->factory->requestedSessionConfigs( @@ -112,11 +112,11 @@ - (void)addTab:(igl::shell::RenderSessionConfig)config supported = true; } #endif -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only if (!IGL_DEBUG_VERIFY(supported)) { return; } diff --git a/shell/ios/BackendVersion.h b/shell/ios/BackendVersion.h index 9f52999b098..2f35e939d9e 100644 --- a/shell/ios/BackendVersion.h +++ b/shell/ios/BackendVersion.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: This is a pure Obj-C compatible header (no C++) to simplify bridging with Swift @@ -18,7 +18,7 @@ typedef NS_ENUM(NSUInteger, BackendFlavor) { BackendFlavorOpenGL_ES, BackendFlavorMetal, BackendFlavorVulkan, - // @fb-only: + // @fb-only }; @interface BackendVersion : NSObject diff --git a/shell/ios/BackendVersion.mm b/shell/ios/BackendVersion.mm index ff622324a4a..c21d59afa53 100644 --- a/shell/ios/BackendVersion.mm +++ b/shell/ios/BackendVersion.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "BackendVersion.h" diff --git a/shell/ios/IglShellPlatformAdapter.h b/shell/ios/IglShellPlatformAdapter.h index 470ed29491e..18d1f7afe96 100644 --- a/shell/ios/IglShellPlatformAdapter.h +++ b/shell/ios/IglShellPlatformAdapter.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: This is a pure Obj-C compatible header (no C++) to simplify bridging with Swift diff --git a/shell/ios/IglShellPlatformAdapterInternal.hpp b/shell/ios/IglShellPlatformAdapterInternal.hpp index d4933759512..c9482c3f60d 100644 --- a/shell/ios/IglShellPlatformAdapterInternal.hpp +++ b/shell/ios/IglShellPlatformAdapterInternal.hpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: Only include this in the Obj-C++ implementation (.mm) file // Use the public header in pure Obj-C files diff --git a/shell/ios/IglSurfaceTexturesAdapter.h b/shell/ios/IglSurfaceTexturesAdapter.h index e668f847a57..dd7fcf02586 100644 --- a/shell/ios/IglSurfaceTexturesAdapter.h +++ b/shell/ios/IglSurfaceTexturesAdapter.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: This is a pure Obj-C compatible header (no C++) to simplify bridging with Swift diff --git a/shell/ios/IglSurfaceTexturesAdapterInternal.hpp b/shell/ios/IglSurfaceTexturesAdapterInternal.hpp index 5682c9e568d..14849b74718 100644 --- a/shell/ios/IglSurfaceTexturesAdapterInternal.hpp +++ b/shell/ios/IglSurfaceTexturesAdapterInternal.hpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: Only include this in the Obj-C++ implementation (.mm) file // Use the public header in pure Obj-C files diff --git a/shell/ios/RenderSessionController.h b/shell/ios/RenderSessionController.h index 5db8d9d6ee8..e199a054b0a 100644 --- a/shell/ios/RenderSessionController.h +++ b/shell/ios/RenderSessionController.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: This is a pure Obj-C compatible header (no C++) to simplify bridging with Swift diff --git a/shell/ios/RenderSessionController.mm b/shell/ios/RenderSessionController.mm index cef316fa6fa..a2c2cccaeec 100644 --- a/shell/ios/RenderSessionController.mm +++ b/shell/ios/RenderSessionController.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "RenderSessionController.h" @@ -26,11 +26,11 @@ #import #import #endif -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only #include #include #include @@ -60,8 +60,8 @@ - (instancetype)initWithBackendVersion:(BackendVersion*)backendVersion factory_ = [factoryProvider adapter]->factory; frame_ = CGRectMake(0, 0, 1024, 768); // choose some default - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only surfaceTexturesProvider_ = provider; } return self; @@ -89,19 +89,19 @@ - (void)initializeDevice { #endif break; } -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only default: IGL_DEBUG_ABORT("IGL Samples not set up for backend(%d)", (int)backendVersion_.flavor); break; @@ -135,11 +135,11 @@ - (void)stop { - (void)tick { igl::DeviceScope scope(platform_->getDevice()); - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only IglSurfaceTexturesAdapter* adapter = [surfaceTexturesProvider_ createSurfaceTextures]; - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only // process user input platform_->getInputDispatcher().processEvents(); diff --git a/shell/ios/RenderSessionFactoryAdapter.h b/shell/ios/RenderSessionFactoryAdapter.h index 23b9df7a4e5..eb7d7f11bad 100644 --- a/shell/ios/RenderSessionFactoryAdapter.h +++ b/shell/ios/RenderSessionFactoryAdapter.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: This is a pure Obj-C compatible header (no C++) to simplify bridging with Swift diff --git a/shell/ios/RenderSessionFactoryAdapterInternal.hpp b/shell/ios/RenderSessionFactoryAdapterInternal.hpp index b3be6bc71a5..604cbc651b3 100644 --- a/shell/ios/RenderSessionFactoryAdapterInternal.hpp +++ b/shell/ios/RenderSessionFactoryAdapterInternal.hpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: Only include this in the Obj-C++ implementation (.mm) file // Use the public header in pure Obj-C files diff --git a/shell/ios/RenderSessionFactoryProvider.h b/shell/ios/RenderSessionFactoryProvider.h index a96e7ebb186..820f80be86f 100644 --- a/shell/ios/RenderSessionFactoryProvider.h +++ b/shell/ios/RenderSessionFactoryProvider.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // NOTE: This is a pure Obj-C compatible header (no C++) to simplify bridging with Swift diff --git a/shell/ios/RenderSessionFactoryProvider.mm b/shell/ios/RenderSessionFactoryProvider.mm index 8266ad83320..5cb6f151fa7 100644 --- a/shell/ios/RenderSessionFactoryProvider.mm +++ b/shell/ios/RenderSessionFactoryProvider.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "RenderSessionFactoryProvider.h" diff --git a/shell/ios/View.h b/shell/ios/View.h index e9b13a75300..268b13a3067 100644 --- a/shell/ios/View.h +++ b/shell/ios/View.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import #import diff --git a/shell/ios/View.m b/shell/ios/View.m index 15e7164a690..e750a4247c4 100644 --- a/shell/ios/View.m +++ b/shell/ios/View.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "View.h" diff --git a/shell/ios/ViewController.h b/shell/ios/ViewController.h index 20dce4b7452..c602192b617 100644 --- a/shell/ios/ViewController.h +++ b/shell/ios/ViewController.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "RenderSessionFactoryProvider.h" #import diff --git a/shell/ios/ViewController.mm b/shell/ios/ViewController.mm index 515d777ad3c..6d3b7b4c314 100644 --- a/shell/ios/ViewController.mm +++ b/shell/ios/ViewController.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "ViewController.h" @@ -30,20 +30,20 @@ #import #endif -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only #include #include #include #include -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only @interface ViewController () { igl::shell::RenderSessionConfig config_; @@ -93,12 +93,12 @@ - (instancetype)init:(igl::shell::RenderSessionConfig)config - (void)initRenderSessionController { IGL_DEBUG_ASSERT(renderSessionController_); -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only [renderSessionController_ initializeDevice]; } @@ -135,16 +135,16 @@ - (void)initRenderSessionController { } #endif -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only default: { IGL_DEBUG_ASSERT_NOT_REACHED(); @@ -216,9 +216,9 @@ - (void)loadView { case igl::BackendFlavor::Vulkan: IGL_DEBUG_ABORT("IGL Samples not set up for Vulkan backend"); break; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only } } @@ -233,9 +233,9 @@ - (void)viewDidLoad { - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; -// @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only +// @fb-only if (config_.backendVersion.flavor != igl::BackendFlavor::Metal) { IGL_DEBUG_ASSERT(renderSessionController_); [renderSessionController_ start]; @@ -244,9 +244,9 @@ - (void)viewWillAppear:(BOOL)animated { - (void)viewWillDisappear:(BOOL)animated { [super viewWillDisappear:animated]; -// @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only +// @fb-only if (config_.backendVersion.flavor != igl::BackendFlavor::Metal) { IGL_DEBUG_ASSERT(renderSessionController_); diff --git a/shell/ios/main.mm b/shell/ios/main.mm index f1d3b0ffede..8e849349006 100644 --- a/shell/ios/main.mm +++ b/shell/ios/main.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "AppDelegate.h" diff --git a/shell/mac/AppDelegate.mm b/shell/mac/AppDelegate.mm index 2247fc319e9..16a3fb129b9 100644 --- a/shell/mac/AppDelegate.mm +++ b/shell/mac/AppDelegate.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only // @lint-ignore-every CLANGTIDY NonLocalizedStringChecker #import "AppDelegate.h" @@ -120,26 +120,26 @@ - (void)setupViewController { .swapchainColorTextureFormat = kColorFramebufferFormat, }, // clang-format off - // @fb-only: + // @fb-only // clang-format on - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only #endif -// @fb-only: +// @fb-only // clang-format off - // @fb-only: + // @fb-only // clang-format on - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only #if IGL_BACKEND_VULKAN { .displayName = "Vulkan", @@ -193,11 +193,11 @@ - (void)addTab:(igl::shell::RenderSessionWindowConfig)windowConfig [self.window setColorSpace:metalColorSpace]; } #endif -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only #if IGL_BACKEND_VULKAN if (sessionConfig.backendVersion.flavor == igl::BackendFlavor::Vulkan) { supported = true; diff --git a/shell/mac/GLView.mm b/shell/mac/GLView.mm index 664f1478b90..52d34f60990 100644 --- a/shell/mac/GLView.mm +++ b/shell/mac/GLView.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "GLView.h" diff --git a/shell/mac/HeadlessView.mm b/shell/mac/HeadlessView.mm index 59167322d70..18eeaea6c18 100644 --- a/shell/mac/HeadlessView.mm +++ b/shell/mac/HeadlessView.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "HeadlessView.h" diff --git a/shell/mac/MetalView.m b/shell/mac/MetalView.m index c8306143076..1a719d87b7a 100644 --- a/shell/mac/MetalView.m +++ b/shell/mac/MetalView.m @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "MetalView.h" diff --git a/shell/mac/ViewController.mm b/shell/mac/ViewController.mm index 0d455b56e3c..20f1b59e747 100644 --- a/shell/mac/ViewController.mm +++ b/shell/mac/ViewController.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "ViewController.h" @@ -13,7 +13,7 @@ #import "HeadlessView.h" #import "MetalView.h" #import "VulkanView.h" -// @fb-only: +// @fb-only #import #import @@ -33,11 +33,11 @@ #include #include #include -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only #if IGL_BACKEND_VULKAN #import #import @@ -116,15 +116,15 @@ - (void)render { igl::SurfaceTextures surfaceTextures; if (config_.backendVersion.flavor != igl::BackendFlavor::Invalid && shellPlatform_->getDevicePtr() != nullptr) { -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only // surface textures surfaceTextures = igl::SurfaceTextures{[self createTextureFromNativeDrawable], @@ -136,12 +136,12 @@ - (void)render { // update retina scale float pixelsPerPoint = shellParams_.nativeSurfaceDimensions.x / shellParams_.viewportSize.x; session_->setPixelsPerPoint(pixelsPerPoint); -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only } // draw session_->update(std::move(surfaceTextures)); @@ -160,8 +160,8 @@ - (void)loadView { auto headlessView = [[HeadlessView alloc] initWithFrame:frame_]; self.view = headlessView; - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only // Headless platform does not run on a real device shellPlatform_ = std::make_shared(nullptr); @@ -322,30 +322,30 @@ - (void)loadView { } #endif -// @fb-only: - // @fb-only: - // @fb-only: +// @fb-only + // @fb-only + // @fb-only - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only - // @fb-only: + // @fb-only - // @fb-only: + // @fb-only - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: + // @fb-only + // @fb-only + // @fb-only +// @fb-only default: { IGL_DEBUG_ASSERT_NOT_IMPLEMENTED(); @@ -430,15 +430,15 @@ - (void)mtkView:(nonnull MTKView*)view drawableSizeDidChange:(CGSize)size { } #endif -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only default: { IGL_DEBUG_ASSERT_NOT_IMPLEMENTED(); @@ -483,14 +483,14 @@ - (void)mtkView:(nonnull MTKView*)view drawableSizeDidChange:(CGSize)size { } #endif -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only default: { IGL_DEBUG_ASSERT_NOT_IMPLEMENTED(); diff --git a/shell/mac/VulkanView.mm b/shell/mac/VulkanView.mm index 66c33d9e4dc..0166b48553f 100644 --- a/shell/mac/VulkanView.mm +++ b/shell/mac/VulkanView.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #import "VulkanView.h" diff --git a/shell/openxr/XrApp.h b/shell/openxr/XrApp.h index bbaa9665da2..33e31d3f3c5 100644 --- a/shell/openxr/XrApp.h +++ b/shell/openxr/XrApp.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/openxr/XrComposition.cpp b/shell/openxr/XrComposition.cpp index 8291275f22e..849c6ad6b60 100644 --- a/shell/openxr/XrComposition.cpp +++ b/shell/openxr/XrComposition.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/XrCompositionProjection.cpp b/shell/openxr/XrCompositionProjection.cpp index e531ed86e28..0dac96f20b5 100644 --- a/shell/openxr/XrCompositionProjection.cpp +++ b/shell/openxr/XrCompositionProjection.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/XrCompositionQuad.cpp b/shell/openxr/XrCompositionQuad.cpp index e49b277b541..018c0306476 100644 --- a/shell/openxr/XrCompositionQuad.cpp +++ b/shell/openxr/XrCompositionQuad.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/XrHands.cpp b/shell/openxr/XrHands.cpp index 5ab327528d3..49631f1e970 100644 --- a/shell/openxr/XrHands.cpp +++ b/shell/openxr/XrHands.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/XrPassthrough.cpp b/shell/openxr/XrPassthrough.cpp index 0b14a4cb295..54d8e887dc9 100644 --- a/shell/openxr/XrPassthrough.cpp +++ b/shell/openxr/XrPassthrough.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/XrPlatform.h b/shell/openxr/XrPlatform.h index cea8097cd6b..7622061a232 100644 --- a/shell/openxr/XrPlatform.h +++ b/shell/openxr/XrPlatform.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/openxr/XrRefreshRate.cpp b/shell/openxr/XrRefreshRate.cpp index 64a608c8289..31cacf3719b 100644 --- a/shell/openxr/XrRefreshRate.cpp +++ b/shell/openxr/XrRefreshRate.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/XrSwapchainProvider.cpp b/shell/openxr/XrSwapchainProvider.cpp index 33d18801f8a..918a309002b 100644 --- a/shell/openxr/XrSwapchainProvider.cpp +++ b/shell/openxr/XrSwapchainProvider.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/shell/openxr/XrSwapchainProvider.h b/shell/openxr/XrSwapchainProvider.h index d36a379935d..68b6e9d1312 100644 --- a/shell/openxr/XrSwapchainProvider.h +++ b/shell/openxr/XrSwapchainProvider.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/openxr/mobile/AndroidMain.cpp b/shell/openxr/mobile/AndroidMain.cpp index d4c30dbd94e..4ff00f88c4c 100644 --- a/shell/openxr/mobile/AndroidMain.cpp +++ b/shell/openxr/mobile/AndroidMain.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/mobile/XrApp.cpp b/shell/openxr/mobile/XrApp.cpp index 2c378fa6520..8db1a35e0b1 100644 --- a/shell/openxr/mobile/XrApp.cpp +++ b/shell/openxr/mobile/XrApp.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/gles/MainActivity.java b/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/gles/MainActivity.java index 9e73deeea96..669978d07a8 100644 --- a/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/gles/MainActivity.java +++ b/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/gles/MainActivity.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only package com.facebook.igl.shell.openxr.gles; diff --git a/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/vulkan/MainActivity.java b/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/vulkan/MainActivity.java index bb1e91224ec..830894d2b30 100644 --- a/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/vulkan/MainActivity.java +++ b/shell/openxr/mobile/java/com/facebook/igl/shell/openxr/vulkan/MainActivity.java @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only package com.facebook.igl.shell.openxr.vulkan; diff --git a/shell/openxr/mobile/opengl/XrAppImplGLES.cpp b/shell/openxr/mobile/opengl/XrAppImplGLES.cpp index 1066499e0b9..185518138fa 100644 --- a/shell/openxr/mobile/opengl/XrAppImplGLES.cpp +++ b/shell/openxr/mobile/opengl/XrAppImplGLES.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.cpp b/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.cpp index c45d63a7199..0fac52f81c7 100644 --- a/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.cpp +++ b/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.h b/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.h index 768b64f38c3..6ce77f242e3 100644 --- a/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.h +++ b/shell/openxr/mobile/opengl/XrSwapchainProviderImplGLES.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/openxr/mobile/vulkan/XrAppImplVulkan.cpp b/shell/openxr/mobile/vulkan/XrAppImplVulkan.cpp index f7b633f8430..93eca8cc318 100644 --- a/shell/openxr/mobile/vulkan/XrAppImplVulkan.cpp +++ b/shell/openxr/mobile/vulkan/XrAppImplVulkan.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/openxr/mobile/vulkan/XrSwapchainProviderImplVulkan.cpp b/shell/openxr/mobile/vulkan/XrSwapchainProviderImplVulkan.cpp index 28c99540af4..ad8b7792324 100644 --- a/shell/openxr/mobile/vulkan/XrSwapchainProviderImplVulkan.cpp +++ b/shell/openxr/mobile/vulkan/XrSwapchainProviderImplVulkan.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/renderSessions/BasicFramebufferSession.cpp b/shell/renderSessions/BasicFramebufferSession.cpp index 8114c8334f6..ceecc50c370 100644 --- a/shell/renderSessions/BasicFramebufferSession.cpp +++ b/shell/renderSessions/BasicFramebufferSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "BasicFramebufferSession.h" diff --git a/shell/renderSessions/BasicFramebufferSession.h b/shell/renderSessions/BasicFramebufferSession.h index 23c2da5866e..ce392b64a77 100644 --- a/shell/renderSessions/BasicFramebufferSession.h +++ b/shell/renderSessions/BasicFramebufferSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/shell/renderSessions/BindGroupSession.cpp b/shell/renderSessions/BindGroupSession.cpp index 590c18498bd..185cdd4d335 100644 --- a/shell/renderSessions/BindGroupSession.cpp +++ b/shell/renderSessions/BindGroupSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -207,9 +207,9 @@ std::unique_ptr getShaderStagesForBackend(igl::IDevice& devi "", nullptr); return nullptr; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: return igl::ShaderStagesCreator::fromLibraryStringInput( device, getMetalShaderSource().c_str(), "vertexShader", "fragmentShader", "", nullptr); diff --git a/shell/renderSessions/BindGroupSession.h b/shell/renderSessions/BindGroupSession.h index 2caaaf13a22..27a19284288 100644 --- a/shell/renderSessions/BindGroupSession.h +++ b/shell/renderSessions/BindGroupSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/ColorSession.cpp b/shell/renderSessions/ColorSession.cpp index 19ff1be7597..15eab8758a6 100644 --- a/shell/renderSessions/ColorSession.cpp +++ b/shell/renderSessions/ColorSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include @@ -152,7 +152,7 @@ std::string getVulkanFragmentShaderSource() { )"; } -// @fb-only: +// @fb-only std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) { switch (device.getBackendType()) { @@ -176,16 +176,16 @@ std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) { "", nullptr); } - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: return igl::ShaderStagesCreator::fromLibraryStringInput( device, getMetalShaderSource().c_str(), "vertexShader", "fragmentShader", "", nullptr); @@ -334,11 +334,11 @@ void ColorSession::update(igl::SurfaceTextures surfaceTextures) noexcept { // Uniform: "color" if (!fragmentUniformDescriptors_.empty()) { - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only if (getPlatform().getDevice().hasFeature(DeviceFeatures::BindUniform)) { fragmentUniformDescriptors_.back().location = pipelineState_->getIndexByName("color", igl::ShaderStage::Fragment); diff --git a/shell/renderSessions/ColorSession.h b/shell/renderSessions/ColorSession.h index 3d3181eaafb..739adef6bca 100644 --- a/shell/renderSessions/ColorSession.h +++ b/shell/renderSessions/ColorSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/DrawInstancedSession.cpp b/shell/renderSessions/DrawInstancedSession.cpp index f1df7091827..6da1e226619 100644 --- a/shell/renderSessions/DrawInstancedSession.cpp +++ b/shell/renderSessions/DrawInstancedSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "DrawInstancedSession.h" @@ -129,9 +129,9 @@ std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) { "", nullptr); return nullptr; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: return igl::ShaderStagesCreator::fromLibraryStringInput( device, getMetalShaderSource(), "vertexShader", "fragmentShader", "", nullptr); diff --git a/shell/renderSessions/DrawInstancedSession.h b/shell/renderSessions/DrawInstancedSession.h index 601f85b832b..d4c6fcc4af3 100644 --- a/shell/renderSessions/DrawInstancedSession.h +++ b/shell/renderSessions/DrawInstancedSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/EmptySession.cpp b/shell/renderSessions/EmptySession.cpp index f81d57e450e..7f4b58c8780 100644 --- a/shell/renderSessions/EmptySession.cpp +++ b/shell/renderSessions/EmptySession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "EmptySession.h" diff --git a/shell/renderSessions/EmptySession.h b/shell/renderSessions/EmptySession.h index a76eeee8e75..69f30f80f77 100644 --- a/shell/renderSessions/EmptySession.h +++ b/shell/renderSessions/EmptySession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/GPUStressSession.cpp b/shell/renderSessions/GPUStressSession.cpp index 0608aa95171..75c914961f4 100644 --- a/shell/renderSessions/GPUStressSession.cpp +++ b/shell/renderSessions/GPUStressSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "GPUStressSession.h" #include @@ -217,9 +217,9 @@ layout(push_constant) uniform PushConstants { std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) noexcept { const bool bMultiView = device.hasFeature(DeviceFeatures::Multiview); switch (device.getBackendType()) { - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Vulkan: return igl::ShaderStagesCreator::fromModuleStringInput( device, diff --git a/shell/renderSessions/GPUStressSession.h b/shell/renderSessions/GPUStressSession.h index 25b2b3bb1ea..17fd53c7226 100644 --- a/shell/renderSessions/GPUStressSession.h +++ b/shell/renderSessions/GPUStressSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/HandsOpenXRSession.cpp b/shell/renderSessions/HandsOpenXRSession.cpp index a9b922ee416..a4e00e8b3ae 100644 --- a/shell/renderSessions/HandsOpenXRSession.cpp +++ b/shell/renderSessions/HandsOpenXRSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -95,9 +95,9 @@ std::string getVulkanVertexShaderSource(bool stereoRendering) { case igl::BackendType::Metal: IGL_DEBUG_ABORT("Metal is not supported"); return nullptr; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Vulkan: return igl::ShaderStagesCreator::fromModuleStringInput( device, diff --git a/shell/renderSessions/HandsOpenXRSession.h b/shell/renderSessions/HandsOpenXRSession.h index 7472270af3a..6c620ce7dcb 100644 --- a/shell/renderSessions/HandsOpenXRSession.h +++ b/shell/renderSessions/HandsOpenXRSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/HelloOpenXRSession.cpp b/shell/renderSessions/HelloOpenXRSession.cpp index 13719c0a381..551ceb8f275 100644 --- a/shell/renderSessions/HelloOpenXRSession.cpp +++ b/shell/renderSessions/HelloOpenXRSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -105,9 +105,9 @@ std::string getVulkanVertexShaderSource(bool stereoRendering) { case igl::BackendType::Metal: IGL_DEBUG_ABORT("Metal is not supported"); return nullptr; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Vulkan: return igl::ShaderStagesCreator::fromModuleStringInput( device, diff --git a/shell/renderSessions/HelloOpenXRSession.h b/shell/renderSessions/HelloOpenXRSession.h index 68fb2e3feff..443a9196807 100644 --- a/shell/renderSessions/HelloOpenXRSession.h +++ b/shell/renderSessions/HelloOpenXRSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/HelloWorldSession.cpp b/shell/renderSessions/HelloWorldSession.cpp index f47458cb47c..303ed675d1a 100644 --- a/shell/renderSessions/HelloWorldSession.cpp +++ b/shell/renderSessions/HelloWorldSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "HelloWorldSession.h" #include @@ -127,9 +127,9 @@ std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) { "main", "", nullptr); - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: return igl::ShaderStagesCreator::fromLibraryStringInput( device, getMetalShaderSource().c_str(), "vertexShader", "fragmentShader", "", nullptr); diff --git a/shell/renderSessions/HelloWorldSession.h b/shell/renderSessions/HelloWorldSession.h index baf1bb3e694..71ca0b6283b 100644 --- a/shell/renderSessions/HelloWorldSession.h +++ b/shell/renderSessions/HelloWorldSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/ImguiSession.cpp b/shell/renderSessions/ImguiSession.cpp index eeff3dd1956..45844169d28 100644 --- a/shell/renderSessions/ImguiSession.cpp +++ b/shell/renderSessions/ImguiSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/renderSessions/ImguiSession.h b/shell/renderSessions/ImguiSession.h index cd7a1c541d6..6ec0b3fdd9f 100644 --- a/shell/renderSessions/ImguiSession.h +++ b/shell/renderSessions/ImguiSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/MRTSession.cpp b/shell/renderSessions/MRTSession.cpp index 36d90500c0b..f6056812c7e 100644 --- a/shell/renderSessions/MRTSession.cpp +++ b/shell/renderSessions/MRTSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -252,9 +252,9 @@ static std::unique_ptr createShaderStagesForBackend(const IDevice "main", "", nullptr); - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::OpenGL: return igl::ShaderStagesCreator::fromModuleStringInput( device, diff --git a/shell/renderSessions/MRTSession.h b/shell/renderSessions/MRTSession.h index cc0d047f257..b88f30a815d 100644 --- a/shell/renderSessions/MRTSession.h +++ b/shell/renderSessions/MRTSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/TQMultiRenderPassSession.cpp b/shell/renderSessions/TQMultiRenderPassSession.cpp index b00375bd66f..9f2444d9e3c 100644 --- a/shell/renderSessions/TQMultiRenderPassSession.cpp +++ b/shell/renderSessions/TQMultiRenderPassSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -113,9 +113,9 @@ static std::unique_ptr getShaderStagesForBackend(igl::IDevice& de case igl::BackendType::Vulkan: IGL_DEBUG_ABORT("IGLSamples not set up for Vulkan"); return nullptr; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: return igl::ShaderStagesCreator::fromLibraryStringInput( device, getMetalShaderSource().c_str(), "vertexShader", "fragmentShader", "", nullptr); diff --git a/shell/renderSessions/TQMultiRenderPassSession.h b/shell/renderSessions/TQMultiRenderPassSession.h index 86b82e28fe8..dab258d226c 100644 --- a/shell/renderSessions/TQMultiRenderPassSession.h +++ b/shell/renderSessions/TQMultiRenderPassSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/TQSession.cpp b/shell/renderSessions/TQSession.cpp index 6a5d3e2b94b..b996756d8bc 100644 --- a/shell/renderSessions/TQSession.cpp +++ b/shell/renderSessions/TQSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -139,7 +139,7 @@ std::string getVulkanFragmentShaderSource() { } )"; } -// @fb-only: +// @fb-only std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) { switch (device.getBackendType()) { @@ -155,16 +155,16 @@ std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) { "main", "", nullptr); - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: return igl::ShaderStagesCreator::fromLibraryStringInput( device, getMetalShaderSource().c_str(), "vertexShader", "fragmentShader", "", nullptr); @@ -292,11 +292,11 @@ void TQSession::update(igl::SurfaceTextures surfaceTextures) noexcept { // Uniform: "color" if (!fragmentUniformDescriptors_.empty()) { - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only if (getPlatform().getDevice().hasFeature(DeviceFeatures::BindUniform)) { fragmentUniformDescriptors_.back().location = pipelineState_->getIndexByName("color", igl::ShaderStage::Fragment); diff --git a/shell/renderSessions/TQSession.h b/shell/renderSessions/TQSession.h index 1f8151bb8f9..71fcb41830a 100644 --- a/shell/renderSessions/TQSession.h +++ b/shell/renderSessions/TQSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/Textured3DCubeSession.cpp b/shell/renderSessions/Textured3DCubeSession.cpp index a353ffde902..e3f9f7730a7 100644 --- a/shell/renderSessions/Textured3DCubeSession.cpp +++ b/shell/renderSessions/Textured3DCubeSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -173,9 +173,9 @@ static std::unique_ptr getShaderStagesForBackend(igl::IDevice& de "", nullptr); return nullptr; - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only case igl::BackendType::Metal: return igl::ShaderStagesCreator::fromLibraryStringInput( device, getMetalShaderSource().c_str(), "vertexShader", "fragmentShader", "", nullptr); diff --git a/shell/renderSessions/Textured3DCubeSession.h b/shell/renderSessions/Textured3DCubeSession.h index 2295cedbdac..431b37eb007 100644 --- a/shell/renderSessions/Textured3DCubeSession.h +++ b/shell/renderSessions/Textured3DCubeSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/TinyMeshBindGroupSession.cpp b/shell/renderSessions/TinyMeshBindGroupSession.cpp index 9f64676b9ea..bcc8eee1c39 100644 --- a/shell/renderSessions/TinyMeshBindGroupSession.cpp +++ b/shell/renderSessions/TinyMeshBindGroupSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "TinyMeshBindGroupSession.h" @@ -265,11 +265,11 @@ static std::unique_ptr getShaderStagesForBackend(igl::IDevice& de return nullptr; #endif // IGL_BACKEND_VULKAN -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only #if IGL_BACKEND_METAL case igl::BackendType::Metal: @@ -453,9 +453,9 @@ void TinyMeshBindGroupSession::createRenderPipeline() { 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(); } diff --git a/shell/renderSessions/TinyMeshBindGroupSession.h b/shell/renderSessions/TinyMeshBindGroupSession.h index 3af6cf651dc..3c23c5f897a 100644 --- a/shell/renderSessions/TinyMeshBindGroupSession.h +++ b/shell/renderSessions/TinyMeshBindGroupSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/TinyMeshSession.cpp b/shell/renderSessions/TinyMeshSession.cpp index c27a5cab0e2..7b9ea27be3c 100644 --- a/shell/renderSessions/TinyMeshSession.cpp +++ b/shell/renderSessions/TinyMeshSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "TinyMeshSession.h" @@ -257,11 +257,11 @@ static std::unique_ptr getShaderStagesForBackend(igl::IDevice& de return nullptr; #endif // IGL_BACKEND_VULKAN -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only #if IGL_BACKEND_METAL case igl::BackendType::Metal: @@ -394,9 +394,9 @@ void TinyMeshSession::initialize() noexcept { { fs::path dir = fs::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 != fs::current_path().root_path() && !fs::exists(dir / fs::path(contentFolder))) { dir = dir.parent_path(); } diff --git a/shell/renderSessions/TinyMeshSession.h b/shell/renderSessions/TinyMeshSession.h index 30807b29f7e..18d6f8dfbd2 100644 --- a/shell/renderSessions/TinyMeshSession.h +++ b/shell/renderSessions/TinyMeshSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/renderSessions/YUVColorSession.cpp b/shell/renderSessions/YUVColorSession.cpp index b650c5199b4..998c80ee067 100644 --- a/shell/renderSessions/YUVColorSession.cpp +++ b/shell/renderSessions/YUVColorSession.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include @@ -92,7 +92,7 @@ std::string getVulkanFragmentShaderSource() { std::unique_ptr getShaderStagesForBackend(igl::IDevice& device) { switch (device.getBackendType()) { - // @fb-only: + // @fb-only case igl::BackendType::Invalid: case igl::BackendType::Metal: IGL_DEBUG_ASSERT_NOT_REACHED(); diff --git a/shell/renderSessions/YUVColorSession.h b/shell/renderSessions/YUVColorSession.h index 5ef23d9ca10..2268a9a0c9b 100644 --- a/shell/renderSessions/YUVColorSession.h +++ b/shell/renderSessions/YUVColorSession.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/shared/fileLoader/android/FileLoaderAndroid.cpp b/shell/shared/fileLoader/android/FileLoaderAndroid.cpp index 2c8867a53e8..8a00e45abc3 100644 --- a/shell/shared/fileLoader/android/FileLoaderAndroid.cpp +++ b/shell/shared/fileLoader/android/FileLoaderAndroid.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/shell/shared/fileLoader/linux/FileLoaderLinux.cpp b/shell/shared/fileLoader/linux/FileLoaderLinux.cpp index 51a7f6032df..a75cb3141f5 100644 --- a/shell/shared/fileLoader/linux/FileLoaderLinux.cpp +++ b/shell/shared/fileLoader/linux/FileLoaderLinux.cpp @@ -12,9 +12,9 @@ #include #include #include -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only namespace { @@ -85,15 +85,15 @@ std::string FileLoaderLinux::fullPath(const std::string& fileName) const { "samples/resources/models/", "samples/resources/fonts/", "samples/resources/fonts/optimistic", - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only }; // find folders somewhere above our current directory @@ -103,29 +103,29 @@ std::string FileLoaderLinux::fullPath(const std::string& fileName) const { } } -// @fb-only: +// @fb-only // clang-format off - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only // clang-format on - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only IGL_DEBUG_ASSERT_NOT_REACHED(); return ""; diff --git a/shell/shared/fileLoader/win/FileLoaderWin.cpp b/shell/shared/fileLoader/win/FileLoaderWin.cpp index 6907d985083..5ea65a1d97c 100644 --- a/shell/shared/fileLoader/win/FileLoaderWin.cpp +++ b/shell/shared/fileLoader/win/FileLoaderWin.cpp @@ -12,9 +12,9 @@ #include #include #include -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only #if IGL_PLATFORM_WINDOWS #include #endif @@ -95,14 +95,14 @@ std::string FileLoaderWin::fullPath(const std::string& fileName) const { "samples/resources/models/", "samples/resources/fonts/", "samples/resources/fonts/optimistic", - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only }; // find folders somewhere above our current directory @@ -115,20 +115,20 @@ std::string FileLoaderWin::fullPath(const std::string& fileName) const { #if !defined(IGL_CMAKE_BUILD) // @lint-ignore CLANGTIDY const std::string resfolders[] = { - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only }; - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only #endif return fileName; diff --git a/shell/shared/input/InputDispatcher.cpp b/shell/shared/input/InputDispatcher.cpp index 71dbaf850fb..e9d6f79916c 100644 --- a/shell/shared/input/InputDispatcher.cpp +++ b/shell/shared/input/InputDispatcher.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include "InputDispatcher.h" #include "MouseListener.h" diff --git a/shell/shared/netservice/Stream.h b/shell/shared/netservice/Stream.h index 6f3815b287f..e43e9b1c4db 100644 --- a/shell/shared/netservice/Stream.h +++ b/shell/shared/netservice/Stream.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/shared/netservice/apple/NetServiceApple.mm b/shell/shared/netservice/apple/NetServiceApple.mm index ce66375151d..bd3d5b2d2e5 100644 --- a/shell/shared/netservice/apple/NetServiceApple.mm +++ b/shell/shared/netservice/apple/NetServiceApple.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/shared/netservice/apple/NetServiceExtensionApple.mm b/shell/shared/netservice/apple/NetServiceExtensionApple.mm index 580c58aec87..4aded2d19c1 100644 --- a/shell/shared/netservice/apple/NetServiceExtensionApple.mm +++ b/shell/shared/netservice/apple/NetServiceExtensionApple.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/shared/netservice/apple/StreamApple.h b/shell/shared/netservice/apple/StreamApple.h index 7efa59dbc2a..1c8c248a2c4 100644 --- a/shell/shared/netservice/apple/StreamApple.h +++ b/shell/shared/netservice/apple/StreamApple.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/shared/netservice/apple/StreamApple.mm b/shell/shared/netservice/apple/StreamApple.mm index 40c71e0f75c..c0c2d51a242 100644 --- a/shell/shared/netservice/apple/StreamApple.mm +++ b/shell/shared/netservice/apple/StreamApple.mm @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/shared/netservice/zeromq/StreamZeroMQ.h b/shell/shared/netservice/zeromq/StreamZeroMQ.h index 891a58c7319..92fc3a020c0 100644 --- a/shell/shared/netservice/zeromq/StreamZeroMQ.h +++ b/shell/shared/netservice/zeromq/StreamZeroMQ.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/shell/shared/platform/android/PlatformAndroid.cpp b/shell/shared/platform/android/PlatformAndroid.cpp index 2e39e4f1f88..3b838eb8787 100644 --- a/shell/shared/platform/android/PlatformAndroid.cpp +++ b/shell/shared/platform/android/PlatformAndroid.cpp @@ -7,9 +7,9 @@ #include -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only #include #include #include @@ -25,51 +25,51 @@ #endif namespace { -// @fb-only: +// @fb-only // @fb-only// Try to get ActivityThread so we can get a Context - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only // @fb-only // @fb-only // Get an Application (a Context) object from ActivityThread - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only - // @fb-only: -// @fb-only: - // @fb-only -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only - // @fb-only: -// @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only + // @fb-only +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only } // namespace namespace igl::shell { PlatformAndroid::PlatformAndroid(std::shared_ptr device, bool useFakeLoader) : device_(std::move(device)) { - // @fb-only: + // @fb-only fileLoader_ = std::make_unique(); - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only imageLoader_ = std::make_unique(*fileLoader_); if (!useFakeLoader) { imageWriter_ = std::make_unique(); diff --git a/shell/shared/testShell/TestShell.cpp b/shell/shared/testShell/TestShell.cpp index c48bb53a6f8..1dce820c261 100644 --- a/shell/shared/testShell/TestShell.cpp +++ b/shell/shared/testShell/TestShell.cpp @@ -34,9 +34,9 @@ std::shared_ptr<::igl::IDevice> createTestDevice() { return tests::util::device::createTestDevice(::igl::BackendType::Metal); } else if (backend == "vulkan") { return tests::util::device::createTestDevice(::igl::BackendType::Vulkan); - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only return nullptr; } } diff --git a/shell/windows/common/GlfwShell.cpp b/shell/windows/common/GlfwShell.cpp index fab406cf989..b1e1e96d444 100644 --- a/shell/windows/common/GlfwShell.cpp +++ b/shell/windows/common/GlfwShell.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/windows/opengl/App.cpp b/shell/windows/opengl/App.cpp index ba54cee940d..bc3c4f18072 100644 --- a/shell/windows/opengl/App.cpp +++ b/shell/windows/opengl/App.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/shell/windows/opengles/App.cpp b/shell/windows/opengles/App.cpp index 9c3f740ea39..f280f78c472 100644 --- a/shell/windows/opengles/App.cpp +++ b/shell/windows/opengles/App.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/shell/windows/vulkan/App.cpp b/shell/windows/vulkan/App.cpp index 999c363cf30..2cc1b21540a 100644 --- a/shell/windows/vulkan/App.cpp +++ b/shell/windows/vulkan/App.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/src/igl/Buffer.h b/src/igl/Buffer.h index ce0d1acc413..e919302892e 100644 --- a/src/igl/Buffer.h +++ b/src/igl/Buffer.h @@ -41,7 +41,7 @@ struct BufferDesc { Uniform = 1 << 2, Storage = 1 << 3, Indirect = 1 << 4, - // @fb-only: + // @fb-only }; using BufferType = uint8_t; @@ -50,7 +50,7 @@ struct BufferDesc { Atomic = 1 << 0, UniformBlock = 1 << 1, // Enforces UBO for OpenGL Query = 1 << 2, - // @fb-only: + // @fb-only Ring = 1 << 4, // Metal/Vulkan: Ring buffers with memory for each swapchain image NoCopy = 1 << 5, // Metal: The buffer should re-use previously allocated memory. }; diff --git a/src/igl/Common.cpp b/src/igl/Common.cpp index 5c4e5586b68..1049775e209 100644 --- a/src/igl/Common.cpp +++ b/src/igl/Common.cpp @@ -27,8 +27,8 @@ std::string BackendTypeToString(BackendType backendType) { return "Metal"; case BackendType::Vulkan: return "Vulkan"; - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only } IGL_UNREACHABLE_RETURN(std::string()) } diff --git a/src/igl/Common.h b/src/igl/Common.h index 3b1fc1c6d94..d5eabfaff1c 100644 --- a/src/igl/Common.h +++ b/src/igl/Common.h @@ -137,7 +137,7 @@ enum class BackendType { OpenGL, Metal, Vulkan, - // @fb-only: + // @fb-only }; enum class BackendFlavor : uint8_t { @@ -146,7 +146,7 @@ enum class BackendFlavor : uint8_t { OpenGL_ES, Metal, Vulkan, - // @fb-only: + // @fb-only }; std::string BackendTypeToString(BackendType backendType); diff --git a/src/igl/Config.h b/src/igl/Config.h index 2a8ee34faeb..53cea6fee93 100644 --- a/src/igl/Config.h +++ b/src/igl/Config.h @@ -7,9 +7,9 @@ #pragma once -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only ///-------------------------------------- /// MARK: - Platform @@ -40,15 +40,15 @@ #if !defined(IGL_CMAKE_BUILD) // clang-format off -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only // clang-format on #else // !defined(IGL_CMAKE_BUILD) @@ -190,11 +190,11 @@ #define IGL_BACKEND_VULKAN 0 #endif -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only ///-------------------------------------- /// MARK: - Angle support diff --git a/src/igl/Device.cpp b/src/igl/Device.cpp index 7230a0d788b..5465c358e41 100644 --- a/src/igl/Device.cpp +++ b/src/igl/Device.cpp @@ -61,8 +61,8 @@ Color IDevice::backendDebugColor() const noexcept { return {1.f, 0.f, 1.f, 1.f}; case BackendType::Vulkan: return {0.f, 1.f, 1.f, 1.f}; - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only } IGL_UNREACHABLE_RETURN(Color(0.f, 0.f, 0.f, 0.f)) } diff --git a/src/igl/Device.h b/src/igl/Device.h index f19270af048..8564a40be35 100644 --- a/src/igl/Device.h +++ b/src/igl/Device.h @@ -60,9 +60,9 @@ class IVertexInputState; * production. */ -// @fb-only: - // @fb-only: - // @fb-only: +// @fb-only + // @fb-only + // @fb-only enum class InDevelopementFeatures : uint8_t { // Define your in-development feature enums here DummyFeatureExample, @@ -338,7 +338,7 @@ class IDevice : public ICapabilities { * - OpenGL: Yellow * - Metal: Magenta * - Vulkan: Cyan - // @fb-only: + // @fb-only */ [[nodiscard]] Color backendDebugColor() const noexcept; diff --git a/src/igl/ITrackedResource.h b/src/igl/ITrackedResource.h index 9db518c319c..b2ae7a9c702 100644 --- a/src/igl/ITrackedResource.h +++ b/src/igl/ITrackedResource.h @@ -54,10 +54,10 @@ class ITrackedResource { // return static_cast(this); // So we prevent UBSan by turning off vptr sanitizer on this function // - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only #if defined(__clang__) __attribute__((no_sanitize("vptr"))) #endif diff --git a/src/igl/PlatformDevice.h b/src/igl/PlatformDevice.h index 577a3215195..087df19d246 100644 --- a/src/igl/PlatformDevice.h +++ b/src/igl/PlatformDevice.h @@ -27,7 +27,7 @@ enum class PlatformDeviceType { OpenGLMacOS, OpenGLWebGL, Vulkan, - // @fb-only: + // @fb-only }; /** diff --git a/src/igl/RenderPipelineState.h b/src/igl/RenderPipelineState.h index 30459c5d63c..f96d06c3a1c 100644 --- a/src/igl/RenderPipelineState.h +++ b/src/igl/RenderPipelineState.h @@ -208,7 +208,7 @@ struct RenderPipelineDesc { uint32_t isDynamicBufferMask = 0; // one bit per each buffer // Vulkan only: immutable samplers per each binding slot (for example, Ycbcr conversion etc) - // @fb-only: + // @fb-only std::shared_ptr immutableSamplers[IGL_TEXTURE_SAMPLERS_MAX] = {}; igl::NameHandle debugName; diff --git a/src/igl/metal/DeviceFeatureSet.mm b/src/igl/metal/DeviceFeatureSet.mm index 879ecaed915..e24dcf17c50 100644 --- a/src/igl/metal/DeviceFeatureSet.mm +++ b/src/igl/metal/DeviceFeatureSet.mm @@ -16,8 +16,8 @@ static size_t getGPUFamily(id device) { if (@available(macOS 10.15, iOS 13.0, *)) { typedef std::pair GPUFamilyPair; const std::vector gpuFamilies = { - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only {MTLGPUFamilyApple8, 8}, {MTLGPUFamilyApple7, 7}, {MTLGPUFamilyApple6, 6}, diff --git a/src/igl/metal/RenderCommandEncoder.mm b/src/igl/metal/RenderCommandEncoder.mm index e09a088b36c..9a8741920c7 100644 --- a/src/igl/metal/RenderCommandEncoder.mm +++ b/src/igl/metal/RenderCommandEncoder.mm @@ -136,8 +136,8 @@ } void RenderCommandEncoder::endEncoding() { - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only [encoder_ endEncoding]; encoder_ = nil; } diff --git a/src/igl/opengl/DeviceFeatureSet.cpp b/src/igl/opengl/DeviceFeatureSet.cpp index 6f0158b9871..87db80559af 100644 --- a/src/igl/opengl/DeviceFeatureSet.cpp +++ b/src/igl/opengl/DeviceFeatureSet.cpp @@ -522,8 +522,8 @@ bool DeviceFeatureSet::isInternalFeatureSupported(InternalFeatures feature) cons // Previously it was enabled specifically for Quest 2 on OpenGLES by checking if // GL_VENDOR == "Qualcomm" and GL_RENDERER == "Adreno (TM) 650". // However, Galaxy S20 also matched that and VAO support caused issues. - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only return hasDesktopVersionOrExtension(*this, GLVersion::v3_0, "GL_ARB_vertex_array_object"); case InternalFeatures::VertexAttribDivisor: @@ -911,10 +911,10 @@ bool DeviceFeatureSet::hasRequirement(DeviceRequirement requirement) const { // no need for extension // GL_OES_standard_derivatives extension required only for versions prior to ES 3.0 - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only return usesOpenGLES() && !hasESVersion(*this, GLVersion::v3_0_ES); case DeviceRequirement::TextureArrayExtReq: @@ -934,10 +934,10 @@ bool DeviceFeatureSet::hasRequirement(DeviceRequirement requirement) const { // So if we are running on anything lower than OpenGL 3.0, we will need the extension // GL_EXT_shader_texture_lod extension required only for versions prior to ES 3.0 - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only return !hasDesktopOrESVersion(*this, GLVersion::v3_0, GLVersion::v3_0_ES); } return false; diff --git a/src/igl/opengl/DeviceFeatureSet.h b/src/igl/opengl/DeviceFeatureSet.h index 8149f1bdc35..2206f7747dc 100644 --- a/src/igl/opengl/DeviceFeatureSet.h +++ b/src/igl/opengl/DeviceFeatureSet.h @@ -195,7 +195,7 @@ class DeviceFeatureSet final { void initializeExtensions(std::string extensions, std::unordered_set supportedExtensions); - // @fb-only: + // @fb-only [[nodiscard]] GLVersion getGLVersion() const noexcept; [[nodiscard]] ShaderVersion getShaderVersion() const; [[nodiscard]] BackendVersion getBackendVersion() const; diff --git a/src/igl/opengl/DummyTexture.h b/src/igl/opengl/DummyTexture.h index c5b0e3ab19f..97633e8d684 100644 --- a/src/igl/opengl/DummyTexture.h +++ b/src/igl/opengl/DummyTexture.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/src/igl/opengl/Framebuffer.cpp b/src/igl/opengl/Framebuffer.cpp index ab2d3802dd8..2d7e6ebeacc 100644 --- a/src/igl/opengl/Framebuffer.cpp +++ b/src/igl/opengl/Framebuffer.cpp @@ -261,8 +261,8 @@ void Framebuffer::copyBytesColorAttachment(ICommandQueue& /* unused */, // with glReadPixels. getContext().flush(); - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only const auto rangeX = static_cast(range.x); const auto rangeY = static_cast(range.y); const auto rangeWidth = static_cast(range.width); diff --git a/src/igl/opengl/GLFunc.cpp b/src/igl/opengl/GLFunc.cpp index 4032cab7eb1..da96752fb57 100644 --- a/src/igl/opengl/GLFunc.cpp +++ b/src/igl/opengl/GLFunc.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/src/igl/opengl/IContext.cpp b/src/igl/opengl/IContext.cpp index e497f8d395a..037d7aef81c 100644 --- a/src/igl/opengl/IContext.cpp +++ b/src/igl/opengl/IContext.cpp @@ -719,7 +719,7 @@ IContext::IContext() : deviceFeatureSet_(*this) { IContext::~IContext() { IGL_SOFT_ASSERT(refCount_ == 0, "Dangling IContext reference left behind." - // @fb-only: + // @fb-only ); // Clear the zombie guard explicitly so our "secret" stays secret. zombieGuard_ = 0; @@ -2185,9 +2185,9 @@ void IContext::linkProgram(GLuint program) { // NOTE: Explicitly *not* checking for errors // If there is an error, we want the client code to get error message and report // to the user/logs, rather than assert here. - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only } void* IContext::mapBuffer(GLenum target, GLbitfield access) { diff --git a/src/igl/opengl/IContext.h b/src/igl/opengl/IContext.h index e5c6373dc4e..c13f0d803eb 100644 --- a/src/igl/opengl/IContext.h +++ b/src/igl/opengl/IContext.h @@ -460,11 +460,11 @@ class IContext { * When doing so, use the functions below to signal such references so we can at least throw an * error when those references become invalid. */ - // @fb-only: + // @fb-only bool addRef(); bool releaseRef(); - // @fb-only: + // @fb-only /** * The goal here is to try to check whether 'this' is a valid object and not a zombie. Ideally, * this should be handled elsewhere, but until we solve that more difficult problem we can at @@ -498,8 +498,8 @@ class IContext { void enableAutomaticErrorCheck(bool enable); // Manages an adapter pool as recreating this every frame causes unwanted memory allocations. - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only auto& getAdapterPool() { return renderAdapterPool_; } diff --git a/src/igl/opengl/Macros.h b/src/igl/opengl/Macros.h index 0a496239b74..38d9b1f58eb 100644 --- a/src/igl/opengl/Macros.h +++ b/src/igl/opengl/Macros.h @@ -7,7 +7,7 @@ #pragma once -// @fb-only: +// @fb-only #include diff --git a/src/igl/opengl/SamplerState.cpp b/src/igl/opengl/SamplerState.cpp index 0e75d0113f9..8bfa0c3662b 100644 --- a/src/igl/opengl/SamplerState.cpp +++ b/src/igl/opengl/SamplerState.cpp @@ -95,7 +95,7 @@ void SamplerState::bind(ITexture* t) { getContext().texParameteri(target, GL_TEXTURE_MAX_LOD, mipLodMax_); } if (deviceFeatures.hasFeature(DeviceFeatures::TextureFilterAnisotropic)) { - // @fb-only: + // @fb-only // Disable the anisotropic filter for now, it's causing a crash on some devices #if 0 getContext().texParameteri(target, GL_TEXTURE_MAX_ANISOTROPY, maxAnisotropy_); diff --git a/src/igl/opengl/Texture.h b/src/igl/opengl/Texture.h index eb006353b8f..3d2ef357969 100644 --- a/src/igl/opengl/Texture.h +++ b/src/igl/opengl/Texture.h @@ -67,8 +67,8 @@ class Texture : public WithContext, public ITexture { GLuint glTexFormat, GLuint glTexType); - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only [[nodiscard]] virtual GLuint getId() const = 0; /// @brief Calculates a value for GL_PACK_ALIGNMENT or GL_UNPACK_ALIGNMENT for the given byte diff --git a/src/igl/opengl/TextureBuffer.cpp b/src/igl/opengl/TextureBuffer.cpp index a77e3319ae6..c43cc518862 100644 --- a/src/igl/opengl/TextureBuffer.cpp +++ b/src/igl/opengl/TextureBuffer.cpp @@ -76,7 +76,7 @@ Result TextureBuffer::create(const TextureDesc& desc, bool hasStorageAlready) { void TextureBuffer::bindImage(size_t unit) { // The entire codebase used only combined kShaderRead|kShaderWrite access (except tests) - // @fb-only: + // @fb-only // Here we used to have this condition: // getUsage() & TextureUsage::kShaderWrite ? GL_WRITE_ONLY : GL_READ_ONLY, // So it is safe to replace it with GL_READ_WRITE diff --git a/src/igl/opengl/TextureTarget.h b/src/igl/opengl/TextureTarget.h index 8b86ac52f4c..2c41ef564ba 100644 --- a/src/igl/opengl/TextureTarget.h +++ b/src/igl/opengl/TextureTarget.h @@ -36,7 +36,7 @@ class TextureTarget final : public Texture { void attachAsStencil(const AttachmentParams& params) override; void detachAsStencil(bool read) override; - // @fb-only: + // @fb-only [[nodiscard]] GLuint getId() const override { IGL_DEBUG_ASSERT_NOT_REACHED(); return 0; diff --git a/src/igl/opengl/ViewTextureTarget.h b/src/igl/opengl/ViewTextureTarget.h index aaeec80fe97..e3aed35ff6b 100644 --- a/src/igl/opengl/ViewTextureTarget.h +++ b/src/igl/opengl/ViewTextureTarget.h @@ -53,7 +53,7 @@ class ViewTextureTarget final : public Texture { [[nodiscard]] bool isImplicitStorage() const override; - // @fb-only: + // @fb-only [[nodiscard]] GLuint getId() const override { IGL_DEBUG_ASSERT_NOT_REACHED(); return 0; diff --git a/src/igl/opengl/WithContext.cpp b/src/igl/opengl/WithContext.cpp index ab0720b23d8..47473739cd8 100644 --- a/src/igl/opengl/WithContext.cpp +++ b/src/igl/opengl/WithContext.cpp @@ -21,7 +21,7 @@ WithContext::~WithContext() { if (!context_->releaseRef()) { IGL_DEBUG_ABORT( "Object destroyed after the IContext." - // @fb-only: + // @fb-only ); } } @@ -29,7 +29,7 @@ WithContext::~WithContext() { IContext& WithContext::getContext() const { IGL_DEBUG_ASSERT(context_->isLikelyValidObject(), "Accessing invalid IContext reference." - // @fb-only: + // @fb-only ); return *context_; } diff --git a/src/igl/opengl/egl/Context.cpp b/src/igl/opengl/egl/Context.cpp index 1aa67bac025..f3b62bb5d0a 100644 --- a/src/igl/opengl/egl/Context.cpp +++ b/src/igl/opengl/egl/Context.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include @@ -365,7 +365,7 @@ void Context::present(std::shared_ptr /*surface*/) const { void Context::setPresentationTime(long long presentationTimeNs) { // This is a workaround that we cannot call the eglPresentationTimeANDROID directly from // due to some EGL api bugs. - // @fb-only: + // @fb-only bool (*eglPresentationTimeANDROID_)( EGLDisplay dpy, EGLSurface sur, khronos_stime_nanoseconds_t time) = nullptr; eglPresentationTimeANDROID_ = diff --git a/src/igl/opengl/glx/Context.cpp b/src/igl/opengl/glx/Context.cpp index 11575bc8b9c..61d74e283f5 100644 --- a/src/igl/opengl/glx/Context.cpp +++ b/src/igl/opengl/glx/Context.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/src/igl/opengl/ios/PlatformDevice.mm b/src/igl/opengl/ios/PlatformDevice.mm index 866f8d7dfec..4eb36566547 100644 --- a/src/igl/opengl/ios/PlatformDevice.mm +++ b/src/igl/opengl/ios/PlatformDevice.mm @@ -40,8 +40,8 @@ @interface _IGLRenderBufferHolder : NSObject { /// texture so we can reuse it and invalidate it when necessary /// This always returns a renderBufferHolder, but it is up to the responsibility of the caller to /// set _renderBuffer. -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only _IGLRenderBufferHolder* GetAssociatedRenderBufferHolder(CAEAGLLayer* nativeDrawable); } // namespace diff --git a/src/igl/opengl/util/TextureFormat.cpp b/src/igl/opengl/util/TextureFormat.cpp index 57ae2468b71..fd9340e89dd 100644 --- a/src/igl/opengl/util/TextureFormat.cpp +++ b/src/igl/opengl/util/TextureFormat.cpp @@ -9,7 +9,7 @@ namespace igl::opengl::util { -// @fb-only: +// @fb-only /// OpenGL Constants #define GL_ALPHA 0x1906 diff --git a/src/igl/opengl/webgl/Context.cpp b/src/igl/opengl/webgl/Context.cpp index 99726b269a0..f131ab7f848 100644 --- a/src/igl/opengl/webgl/Context.cpp +++ b/src/igl/opengl/webgl/Context.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/src/igl/opengl/webgl/Context.h b/src/igl/opengl/webgl/Context.h index b99ed6bf14e..189005d602f 100644 --- a/src/igl/opengl/webgl/Context.h +++ b/src/igl/opengl/webgl/Context.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/src/igl/opengl/webgl/Device.cpp b/src/igl/opengl/webgl/Device.cpp index e8c8b1b50da..95f24f893f6 100644 --- a/src/igl/opengl/webgl/Device.cpp +++ b/src/igl/opengl/webgl/Device.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/src/igl/opengl/webgl/Device.h b/src/igl/opengl/webgl/Device.h index 86e11c1320b..49d6e7a199e 100644 --- a/src/igl/opengl/webgl/Device.h +++ b/src/igl/opengl/webgl/Device.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/src/igl/opengl/webgl/HWDevice.cpp b/src/igl/opengl/webgl/HWDevice.cpp index 2f87d838982..313136f83b2 100644 --- a/src/igl/opengl/webgl/HWDevice.cpp +++ b/src/igl/opengl/webgl/HWDevice.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/src/igl/opengl/webgl/HWDevice.h b/src/igl/opengl/webgl/HWDevice.h index c06bd5729b9..28283b572fd 100644 --- a/src/igl/opengl/webgl/HWDevice.h +++ b/src/igl/opengl/webgl/HWDevice.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/src/igl/opengl/webgl/PlatformDevice.cpp b/src/igl/opengl/webgl/PlatformDevice.cpp index 3e3023fa3e8..81a57e6514a 100644 --- a/src/igl/opengl/webgl/PlatformDevice.cpp +++ b/src/igl/opengl/webgl/PlatformDevice.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include #include diff --git a/src/igl/opengl/webgl/PlatformDevice.h b/src/igl/opengl/webgl/PlatformDevice.h index bdd3cdbfdd3..1fe367c493f 100644 --- a/src/igl/opengl/webgl/PlatformDevice.h +++ b/src/igl/opengl/webgl/PlatformDevice.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/src/igl/opengl/wgl/Context.cpp b/src/igl/opengl/wgl/Context.cpp index 0e16e160883..80528b407b6 100644 --- a/src/igl/opengl/wgl/Context.cpp +++ b/src/igl/opengl/wgl/Context.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/src/igl/tests/Common.cpp b/src/igl/tests/Common.cpp index c9f1429a258..d30cbf172b3 100644 --- a/src/igl/tests/Common.cpp +++ b/src/igl/tests/Common.cpp @@ -16,7 +16,7 @@ TEST(CommonTest, BackendTypeToStringTest) { ASSERT_EQ(BackendTypeToString(BackendType::OpenGL), "OpenGL"); ASSERT_EQ(BackendTypeToString(BackendType::Metal), "Metal"); ASSERT_EQ(BackendTypeToString(BackendType::Vulkan), "Vulkan"); - // @fb-only: + // @fb-only } TEST(CommonTest, ResultTest) { diff --git a/src/igl/tests/RenderCommandEncoder.cpp b/src/igl/tests/RenderCommandEncoder.cpp index e9b62f9314b..be8b1c6f10a 100644 --- a/src/igl/tests/RenderCommandEncoder.cpp +++ b/src/igl/tests/RenderCommandEncoder.cpp @@ -722,7 +722,7 @@ TEST_F(RenderCommandEncoderTest, shouldNotDraw) { TEST_F(RenderCommandEncoderTest, shouldDrawATriangleBindGroup) { #if IGL_PLATFORM_APPLE if (iglDev_->getBackendType() == igl::BackendType::Vulkan) { - // @fb-only: + // @fb-only GTEST_SKIP() << "Broken on macOS arm64"; return; } diff --git a/src/igl/tests/android/NativeHWBuffer.cpp b/src/igl/tests/android/NativeHWBuffer.cpp index 889fe4772e3..6fa8ad65e1e 100644 --- a/src/igl/tests/android/NativeHWBuffer.cpp +++ b/src/igl/tests/android/NativeHWBuffer.cpp @@ -385,7 +385,7 @@ TEST_F(NativeHWBufferTextureTestOpenGL3, SharedMemoryTexture) { *iglDev_, *cmdQueue_, texture, pixels_.data(), "HWBufferTextureOpenGL3"); } -// @fb-only: +// @fb-only using NativeHWBufferTextureTestVulkan = NativeHWBufferTextureTest<{igl::BackendType::Vulkan}>; TEST_F(NativeHWBufferTextureTestVulkan, SharedMemoryTexture) { @@ -400,7 +400,7 @@ TEST_F(NativeHWBufferTextureTestVulkan, SharedMemoryTexture) { util::validateUploadedTexture( *iglDev_, *cmdQueue_, texture, pixels_.data(), "HWBufferTextureVulkan"); } -// @fb-only: +// @fb-only } // namespace igl::tests diff --git a/src/igl/tests/util/TestDevice.cpp b/src/igl/tests/util/TestDevice.cpp index f3c094f83ba..da237da864b 100644 --- a/src/igl/tests/util/TestDevice.cpp +++ b/src/igl/tests/util/TestDevice.cpp @@ -33,8 +33,8 @@ std::shared_ptr<::igl::IDevice> createTestDevice() { return device::createTestDevice(::igl::BackendType::Metal); } else if (backend == "vulkan") { return device::createTestDevice(::igl::BackendType::Vulkan); - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only } else { return nullptr; } diff --git a/src/igl/tests/util/device/TestDevice.cpp b/src/igl/tests/util/device/TestDevice.cpp index e2ab6a36d34..3c23dcf5740 100644 --- a/src/igl/tests/util/device/TestDevice.cpp +++ b/src/igl/tests/util/device/TestDevice.cpp @@ -30,11 +30,11 @@ #endif // clang-format off -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only +// @fb-only +// @fb-only // clang-format on // @fb-only #if IGL_METAL_SUPPORTED @@ -46,9 +46,9 @@ #if IGL_VULKAN_SUPPORTED #include "vulkan/TestDevice.h" #endif -// @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only namespace igl::tests::util::device { @@ -63,8 +63,8 @@ bool isBackendTypeSupported(::igl::BackendType backendType) { return IGL_OPENGL_SUPPORTED; case ::igl::BackendType::Vulkan: return IGL_VULKAN_SUPPORTED; - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only } IGL_UNREACHABLE_RETURN(false) } @@ -93,13 +93,13 @@ std::shared_ptr<::igl::IDevice> createTestDevice(::igl::BackendType backendType, return nullptr; #endif } - // @fb-only: -// @fb-only: - // @fb-only: -// @fb-only: - // @fb-only: -// @fb-only: - // @fb-only: + // @fb-only +// @fb-only + // @fb-only +// @fb-only + // @fb-only +// @fb-only + // @fb-only return nullptr; } diff --git a/src/igl/tests/vulkan/Device.cpp b/src/igl/tests/vulkan/Device.cpp index 345a62f56d2..f5371242b07 100644 --- a/src/igl/tests/vulkan/Device.cpp +++ b/src/igl/tests/vulkan/Device.cpp @@ -193,7 +193,7 @@ TEST_F(DeviceVulkanTest, EnsureValidation) { "has been temporarily disabled."; #if !defined(IGL_DISABLE_VALIDATION) - // @fb-only: + // @fb-only // igl::vulkan::VulkanContext& ctx = // static_cast(iglDev_.get())->getVulkanContext(); diff --git a/src/igl/tests/vulkan/VulkanSwapchainTest.cpp b/src/igl/tests/vulkan/VulkanSwapchainTest.cpp index 2b7c5a0b888..4f89dc75658 100644 --- a/src/igl/tests/vulkan/VulkanSwapchainTest.cpp +++ b/src/igl/tests/vulkan/VulkanSwapchainTest.cpp @@ -38,7 +38,7 @@ class VulkanSwapchainTest : public ::testing::Test { // Set up common resources. void SetUp() override { #if IGL_PLATFORM_WINDOWS || IGL_PLATFORM_ANDROID - // @fb-only: + // @fb-only GTEST_SKIP() << "Fix these tests on Windows and Android, no headless surface support there."; #else igl::setDebugBreakEnabled(false); @@ -62,7 +62,7 @@ class VulkanSwapchainTest : public ::testing::Test { TEST_F(VulkanSwapchainTest, CreateVulkanSwapchain) { #if IGL_PLATFORM_WINDOWS || IGL_PLATFORM_ANDROID - // @fb-only: + // @fb-only GTEST_SKIP() << "Fix these tests on Windows and Android, no headless surface support there."; #else auto swapchain = std::make_unique(*context_, kWidth, kHeight); diff --git a/src/igl/vulkan/Buffer.cpp b/src/igl/vulkan/Buffer.cpp index eefc1d43312..13c711d6330 100644 --- a/src/igl/vulkan/Buffer.cpp +++ b/src/igl/vulkan/Buffer.cpp @@ -246,7 +246,7 @@ void* Buffer::map(const BufferRange& range, igl::Result* outResult) { // Sanity check if ((range.size > desc_.length) || (range.offset > desc_.length - range.size)) { Result::setResult(outResult, Result::Code::ArgumentOutOfRange, "Range exceeds buffer length"); - // @fb-only: + // @fb-only // @lint-ignore CLANGTIDY return nullptr; } diff --git a/src/igl/vulkan/Common.h b/src/igl/vulkan/Common.h index b5d81cc777e..8c14d85b58a 100644 --- a/src/igl/vulkan/Common.h +++ b/src/igl/vulkan/Common.h @@ -130,7 +130,7 @@ struct VulkanContextConfig { bool enableBufferDeviceAddress = false; bool enableExtraLogs = true; bool enableDescriptorIndexing = false; - // @fb-only: + // @fb-only bool enableShaderInt16 = true; bool enableShaderDrawParameters = true; bool enableStorageBuffer16BitAccess = true; diff --git a/src/igl/vulkan/ComputePipelineState.cpp b/src/igl/vulkan/ComputePipelineState.cpp index 2800968bdb2..744bbe12618 100644 --- a/src/igl/vulkan/ComputePipelineState.cpp +++ b/src/igl/vulkan/ComputePipelineState.cpp @@ -73,7 +73,7 @@ VkPipeline ComputePipelineState::getVkPipeline() const { IGL_PROFILER_FUNCTION_COLOR(IGL_PROFILER_COLOR_CREATE); - // @fb-only: + // @fb-only const VkDescriptorSetLayout DSLs[] = { dslCombinedImageSamplers_->getVkDescriptorSetLayout(), dslBuffers_->getVkDescriptorSetLayout(), diff --git a/src/igl/vulkan/Device.cpp b/src/igl/vulkan/Device.cpp index 7fa1da01d01..f671d9c3d97 100644 --- a/src/igl/vulkan/Device.cpp +++ b/src/igl/vulkan/Device.cpp @@ -318,7 +318,7 @@ std::shared_ptr Device::createShaderModule(const void* IGL_N debugName.c_str())); } - // @fb-only: + // @fb-only // @lint-ignore CLANGTIDY return std::make_shared( ctx_->vf_, @@ -431,7 +431,7 @@ std::shared_ptr Device::createShaderModule(ShaderStage stage debugName.c_str())); } - // @fb-only: + // @fb-only // @lint-ignore CLANGTIDY return std::make_shared( ctx_->vf_, diff --git a/src/igl/vulkan/EnhancedShaderDebuggingStore.cpp b/src/igl/vulkan/EnhancedShaderDebuggingStore.cpp index 6c520191116..fb5bd9f6657 100644 --- a/src/igl/vulkan/EnhancedShaderDebuggingStore.cpp +++ b/src/igl/vulkan/EnhancedShaderDebuggingStore.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #include diff --git a/src/igl/vulkan/EnhancedShaderDebuggingStore.h b/src/igl/vulkan/EnhancedShaderDebuggingStore.h index d35039ca003..ba1eec9b5dd 100644 --- a/src/igl/vulkan/EnhancedShaderDebuggingStore.h +++ b/src/igl/vulkan/EnhancedShaderDebuggingStore.h @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -// @fb-only: +// @fb-only #pragma once diff --git a/src/igl/vulkan/RenderCommandEncoder.cpp b/src/igl/vulkan/RenderCommandEncoder.cpp index fa9030184b2..26c59e0b977 100644 --- a/src/igl/vulkan/RenderCommandEncoder.cpp +++ b/src/igl/vulkan/RenderCommandEncoder.cpp @@ -209,15 +209,15 @@ void RenderCommandEncoder::initialize(const RenderPassDesc& renderPass, renderPassHandle.pass, mipLevel, layer, (uint32_t)clearValues.size(), clearValues.data()); // clang-format off - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only // clang-format on - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only const uint32_t width = std::max(fb.getWidth() >> mipLevel, 1u); const uint32_t height = std::max(fb.getHeight() >> mipLevel, 1u); diff --git a/src/igl/vulkan/RenderPipelineState.cpp b/src/igl/vulkan/RenderPipelineState.cpp index 5ef0d1181de..1f243e1aced 100644 --- a/src/igl/vulkan/RenderPipelineState.cpp +++ b/src/igl/vulkan/RenderPipelineState.cpp @@ -391,7 +391,7 @@ VkPipeline RenderPipelineState::getVkPipeline( IGL_PROFILER_FUNCTION_COLOR(IGL_PROFILER_COLOR_CREATE); - // @fb-only: + // @fb-only const VkDescriptorSetLayout DSLs[] = { dslCombinedImageSamplers_->getVkDescriptorSetLayout(), dslBuffers_->getVkDescriptorSetLayout(), @@ -512,7 +512,7 @@ VkPipeline RenderPipelineState::getVkPipeline( pipelines_[dynamicState] = pipeline; - // @fb-only: + // @fb-only // @lint-ignore CLANGTIDY return pipeline; } diff --git a/src/igl/vulkan/ShaderModule.cpp b/src/igl/vulkan/ShaderModule.cpp index 593128f3ad8..35ff1b1c697 100644 --- a/src/igl/vulkan/ShaderModule.cpp +++ b/src/igl/vulkan/ShaderModule.cpp @@ -22,7 +22,7 @@ ShaderModule::ShaderModule(ShaderModuleInfo info, VkShaderModule ShaderModule::getVkShaderModule(const std::shared_ptr& shaderModule) { const ShaderModule* sm = static_cast(shaderModule.get()); - // @fb-only: + // @fb-only // @lint-ignore CLANGTIDY return sm ? sm->module_->getVkShaderModule() : VK_NULL_HANDLE; } diff --git a/src/igl/vulkan/VulkanContext.cpp b/src/igl/vulkan/VulkanContext.cpp index 4deeb44356c..a1ff45b6a2c 100644 --- a/src/igl/vulkan/VulkanContext.cpp +++ b/src/igl/vulkan/VulkanContext.cpp @@ -22,7 +22,7 @@ #endif // IGL_CMAKE_BUILD // For volk.h, define this before including volk.h in exactly one CPP file. -// @fb-only: +// @fb-only #if defined(IGL_CMAKE_BUILD) #define VOLK_IMPLEMENTATION #endif // IGL_CMAKE_BUILD @@ -190,7 +190,7 @@ bool validateImageLimits(VkImageType imageType, namespace igl::vulkan { -// @fb-only: +// @fb-only class DescriptorPoolsArena final { public: DescriptorPoolsArena(const VulkanContext& ctx, @@ -267,7 +267,7 @@ class DescriptorPoolsArena final { return; } } - // @fb-only: + // @fb-only VkDescriptorPoolSize poolSizes[IGL_ARRAY_NUM_ELEMENTS(types_)]; for (uint32_t i = 0; i != numTypes_; i++) { poolSizes[i] = VkDescriptorPoolSize{ @@ -741,10 +741,10 @@ igl::Result VulkanContext::initContext(const HWDeviceDesc& desc, } } - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: + // @fb-only + // @fb-only + // @fb-only + // @fb-only VulkanQueuePool queuePool(vf_, vkPhysicalDevice_); @@ -1214,45 +1214,45 @@ VulkanImage VulkanContext::createImage(VkImageType imageType, debugName}; } -// @fb-only: -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: -// @fb-only: +// @fb-only +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only +// @fb-only std::unique_ptr VulkanContext::createImageFromFileDescriptor( int32_t fileDescriptor, @@ -1497,7 +1497,7 @@ SamplerHandle VulkanContext::createSampler(const VkSamplerCreateInfo& ci, void VulkanContext::querySurfaceCapabilities() { // This is not an exhaustive list. It's only formats that we are using. - // @fb-only: + // @fb-only const VkFormat depthFormats[] = {VK_FORMAT_D32_SFLOAT_S8_UINT, VK_FORMAT_D24_UNORM_S8_UINT, VK_FORMAT_D16_UNORM_S8_UINT, @@ -1582,7 +1582,7 @@ VulkanContext::RenderPassHandle VulkanContext::findRenderPass( IGL_DEBUG_ASSERT(index <= 255); renderPassesHash_[builder] = uint8_t(index); - // @fb-only: + // @fb-only // @lint-ignore CLANGTIDY renderPasses_.push_back(pass); @@ -1622,11 +1622,11 @@ void VulkanContext::updateBindingsTextures(VkCommandBuffer IGL_NONNULL cmdBuf, VkDescriptorSet dset = arena.getNextDescriptorSet(*immediate_, nextSubmitHandle); - // @fb-only: + // @fb-only VkDescriptorImageInfo infoSampledImages[IGL_TEXTURE_SAMPLERS_MAX]; // uninitialized uint32_t numImages = 0; - // @fb-only: + // @fb-only VkWriteDescriptorSet writes[IGL_TEXTURE_SAMPLERS_MAX]; // uninitialized uint32_t numWrites = 0; @@ -1686,7 +1686,7 @@ void VulkanContext::updateBindingsBuffers(VkCommandBuffer IGL_NONNULL cmdBuf, VkDescriptorSet dset = arena.getNextDescriptorSet(*immediate_, nextSubmitHandle); - // @fb-only: + // @fb-only VkWriteDescriptorSet writes[IGL_UNIFORM_BLOCKS_BINDING_MAX]; // uninitialized uint32_t numWrites = 0; @@ -1856,7 +1856,7 @@ igl::BindGroupTextureHandle VulkanContext::createBindGroup(const BindGroupTextur BindGroupMetadataTextures metadata{desc}; - // @fb-only: + // @fb-only VkDescriptorSetLayoutBinding bindings[IGL_TEXTURE_SAMPLERS_MAX]; // uninitialized uint32_t numBindings = 0; @@ -1881,7 +1881,7 @@ igl::BindGroupTextureHandle VulkanContext::createBindGroup(const BindGroupTextur VkDescriptorSetLayout dsl = VK_NULL_HANDLE; { - // @fb-only: + // @fb-only const VkDescriptorBindingFlags bindingFlags[IGL_TEXTURE_SAMPLERS_MAX] = {}; VK_ASSERT(ivkCreateDescriptorSetLayout(&vf_, @@ -1921,9 +1921,9 @@ igl::BindGroupTextureHandle VulkanContext::createBindGroup(const BindGroupTextur // use the dummy texture to ensure pipeline compatibility VkImageView dummyImageView = textures_.objects_[0].obj_->imageView_.getVkImageView(); - // @fb-only: + // @fb-only VkDescriptorImageInfo images[IGL_TEXTURE_SAMPLERS_MAX]; // uninitialized - // @fb-only: + // @fb-only VkWriteDescriptorSet writes[IGL_TEXTURE_SAMPLERS_MAX]; // uninitialized uint32_t numWrites = 0; @@ -1985,11 +1985,11 @@ igl::BindGroupBufferHandle VulkanContext::createBindGroup(const BindGroupBufferD BindGroupMetadataBuffers metadata{desc}; - // @fb-only: + // @fb-only VkDescriptorSetLayoutBinding bindings[IGL_UNIFORM_BLOCKS_BINDING_MAX]; // uninitialized uint32_t numBindings = 0; - // @fb-only: + // @fb-only VkDescriptorPoolSize poolSizes[] = { VkDescriptorPoolSize{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 0}, VkDescriptorPoolSize{VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 0}, @@ -2057,7 +2057,7 @@ igl::BindGroupBufferHandle VulkanContext::createBindGroup(const BindGroupBufferD VkDescriptorSetLayout dsl = VK_NULL_HANDLE; { - // @fb-only: + // @fb-only const VkDescriptorBindingFlags bindingFlags[IGL_UNIFORM_BLOCKS_BINDING_MAX] = {}; VK_ASSERT(ivkCreateDescriptorSetLayout(&vf_, @@ -2086,9 +2086,9 @@ igl::BindGroupBufferHandle VulkanContext::createBindGroup(const BindGroupBufferD VK_ASSERT(ivkAllocateDescriptorSet(&vf_, device, metadata.pool, dsl, &metadata.dset)); } - // @fb-only: + // @fb-only VkDescriptorBufferInfo buffers[IGL_UNIFORM_BLOCKS_BINDING_MAX]; // uninitialized - // @fb-only: + // @fb-only VkWriteDescriptorSet writes[IGL_UNIFORM_BLOCKS_BINDING_MAX]; // uninitialized uint32_t numWrites = 0; diff --git a/src/igl/vulkan/VulkanContext.h b/src/igl/vulkan/VulkanContext.h index 226b5524f2c..03706b577d1 100644 --- a/src/igl/vulkan/VulkanContext.h +++ b/src/igl/vulkan/VulkanContext.h @@ -116,22 +116,22 @@ class VulkanContext final { igl::Result* IGL_NULLABLE outResult, const char* IGL_NULLABLE debugName = nullptr) const; -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only std::unique_ptr createImageFromFileDescriptor( int32_t fileDescriptor, diff --git a/src/igl/vulkan/VulkanHelpers.h b/src/igl/vulkan/VulkanHelpers.h index 4ed0caadc1b..f30ea9578b0 100644 --- a/src/igl/vulkan/VulkanHelpers.h +++ b/src/igl/vulkan/VulkanHelpers.h @@ -21,20 +21,20 @@ extern "C" { #endif -// @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: -// @fb-only: -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: +// @fb-only +// @fb-only +// @fb-only +// @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only +// @fb-only +// @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only /// @brief Adds a node to the linked list of next nodes void ivkAddNext(void* node, const void* next); diff --git a/src/igl/vulkan/VulkanImage.cpp b/src/igl/vulkan/VulkanImage.cpp index 280bdf5e3b2..4908f6f7c9c 100644 --- a/src/igl/vulkan/VulkanImage.cpp +++ b/src/igl/vulkan/VulkanImage.cpp @@ -198,13 +198,13 @@ VulkanImage::VulkanImage(const VulkanContext& ctx, { const uint32_t numPlanes = igl::vulkan::getNumImagePlanes(format); IGL_DEBUG_ASSERT(numPlanes > 0 && numPlanes <= kMaxImagePlanes); - // @fb-only: + // @fb-only const VkImagePlaneMemoryRequirementsInfo planes[kMaxImagePlanes] = { ivkGetImagePlaneMemoryRequirementsInfo(VK_IMAGE_ASPECT_PLANE_0_BIT), ivkGetImagePlaneMemoryRequirementsInfo(VK_IMAGE_ASPECT_PLANE_1_BIT), ivkGetImagePlaneMemoryRequirementsInfo(VK_IMAGE_ASPECT_PLANE_2_BIT), }; - // @fb-only: + // @fb-only const VkImageMemoryRequirementsInfo2 imgRequirements[kMaxImagePlanes] = { ivkGetImageMemoryRequirementsInfo2(numPlanes > 0 ? &planes[0] : nullptr, vkImage_), ivkGetImageMemoryRequirementsInfo2(numPlanes > 1 ? &planes[1] : nullptr, vkImage_), @@ -220,13 +220,13 @@ VulkanImage::VulkanImage(const VulkanContext& ctx, false, &vkMemory_[p])); } - // @fb-only: + // @fb-only const VkBindImagePlaneMemoryInfo bindImagePlaneMemoryInfo[kMaxImagePlanes] = { {VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO, nullptr, VK_IMAGE_ASPECT_PLANE_0_BIT}, {VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO, nullptr, VK_IMAGE_ASPECT_PLANE_1_BIT}, {VK_STRUCTURE_TYPE_BIND_IMAGE_PLANE_MEMORY_INFO, nullptr, VK_IMAGE_ASPECT_PLANE_2_BIT}, }; - // @fb-only: + // @fb-only const VkBindImageMemoryInfo bindInfo[kMaxImagePlanes] = { ivkGetBindImageMemoryInfo( isDisjoint ? &bindImagePlaneMemoryInfo[0] : nullptr, vkImage_, vkMemory_[0]), @@ -471,20 +471,20 @@ VulkanImage::VulkanImage(const VulkanContext& ctx, memoryRequirements.memoryRequirements.memoryTypeBits, memoryAllocateInfo.memoryTypeIndex); - // @fb-only: - // @fb-only: -// @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: - // @fb-only: -// @fb-only: + // @fb-only + // @fb-only +// @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only + // @fb-only +// @fb-only VK_ASSERT(ctx_->vf_.vkAllocateMemory(device_, &memoryAllocateInfo, nullptr, &vkMemory_[0])); VK_ASSERT(ctx_->vf_.vkBindImageMemory(device_, vkImage_, vkMemory_[0], 0)); -// @fb-only: +// @fb-only } #if IGL_PLATFORM_WINDOWS diff --git a/src/igl/vulkan/VulkanImage.h b/src/igl/vulkan/VulkanImage.h index 06948079dea..b3e9ce2c2d9 100644 --- a/src/igl/vulkan/VulkanImage.h +++ b/src/igl/vulkan/VulkanImage.h @@ -301,7 +301,7 @@ class VulkanImage final { VkImage vkImage_ = VK_NULL_HANDLE; VkImageUsageFlags usageFlags_ = 0; // Separate VkDeviceMemory objects to support disjoint multiplanar images - // @fb-only: + // @fb-only VkDeviceMemory vkMemory_[kMaxImagePlanes] = {VK_NULL_HANDLE, VK_NULL_HANDLE, VK_NULL_HANDLE}; VmaAllocation vmaAllocation_ = VK_NULL_HANDLE; VkFormatProperties formatProperties_{}; diff --git a/src/igl/vulkan/VulkanStagingDevice.cpp b/src/igl/vulkan/VulkanStagingDevice.cpp index aa53aa592e9..c19fb6358c5 100644 --- a/src/igl/vulkan/VulkanStagingDevice.cpp +++ b/src/igl/vulkan/VulkanStagingDevice.cpp @@ -290,7 +290,7 @@ void VulkanStagingDevice::imageData(const VulkanImage& image, const bool is420 = (image.imageFormat_ == VK_FORMAT_G8_B8R8_2PLANE_420_UNORM) || (image.imageFormat_ == VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM); - // @fb-only: + // @fb-only const uint32_t storageSize = is420 ? image.extent_.width * image.extent_.height * 3u / 2u : static_cast(properties.getBytesPerRange(range, bytesPerRow)); @@ -322,7 +322,7 @@ void VulkanStagingDevice::imageData(const VulkanImage& image, std::vector copyRegions; copyRegions.reserve(range.numMipLevels); - // @fb-only: + // @fb-only if (is420) { // this is a prototype support implemented for a couple of multiplanar image formats IGL_DEBUG_ASSERT(range.face == 0 && range.layer == 0 && range.mipLevel == 0); diff --git a/src/igl/vulkan/util/TextureFormat.cpp b/src/igl/vulkan/util/TextureFormat.cpp index 60743a9f95e..53a4fc728ad 100644 --- a/src/igl/vulkan/util/TextureFormat.cpp +++ b/src/igl/vulkan/util/TextureFormat.cpp @@ -11,7 +11,7 @@ namespace igl::vulkan::util { -// @fb-only: +// @fb-only // Vulkan Defines #define VK_FORMAT_UNDEFINED 0