IGL: Use preferred build rules for libraries and tests

Reviewed By: kraisler, nlutsenko, rameshviswanathan Differential Revision: D67116232 fbshipit-source-id: c4def49fdd63882fd8fc0485828b6de077be8509
facebook · Dec 15, 2024 · 50a676f · 50a676f
1 parent 8d7dc97
commit 50a676f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 9 deletions.
diff --git a/shell/renderSessions/GPUStressSession.cpp b/shell/renderSessions/GPUStressSession.cpp
@@ -36,7 +36,7 @@ static uint32_t arc4random(void) {
 }
 #endif // _MSC_VER || IGL_PLATFORM_LINUX
 
-#if ANDROID
+#if IGL_PLATFORM_ANDROID
 
 #include <sys/syscall.h>
 #include <unistd.h>

diff --git a/shell/shared/renderSession/DefaultRenderSessionFactory.h b/shell/shared/renderSession/DefaultRenderSessionFactory.h
@@ -7,11 +7,16 @@
 
 #pragma once
 
+#include <igl/Config.h>
 #include <memory>
 #include <shell/shared/renderSession/IRenderSessionFactory.h>
 
 namespace igl::shell {
 
-std::unique_ptr<IRenderSessionFactory> createDefaultRenderSessionFactory();
+#if IGL_PLATFORM_LINUX
+__attribute__((weak))
+#endif // IGL_PLATFORM_LINUX
+std::unique_ptr<IRenderSessionFactory>
+createDefaultRenderSessionFactory();
 
 } // namespace igl::shell
diff --git a/shell/windows/opengl/AutoContextReleaseDevice.h b/shell/windows/opengl/AutoContextReleaseDevice.h
@@ -7,8 +7,10 @@
 
 #pragma once
 
+#include <igl/Config.h>
+
 // clang-format off
-#if defined(_WIN32)
+#if IGL_PLATFORM_WINDOWS
   #include <igl/opengl/wgl/Context.h>
   #include <igl/opengl/wgl/Device.h>
 #elif IGL_PLATFORM_LINUX
@@ -19,7 +21,7 @@
 
 namespace igl::shell::util {
 
-#if defined(_WIN32)
+#if IGL_PLATFORM_WINDOWS
 struct WGLDevice final : public igl::opengl::Device {
   explicit WGLDevice(std::unique_ptr<igl::opengl::IContext> context) :
     Device(std::move(context)), platformDevice_(*this) {}

diff --git a/src/igl/metal/RenderPipelineReflection.h b/src/igl/metal/RenderPipelineReflection.h
@@ -13,6 +13,10 @@
 #include <map>
 #include <vector>
 
+// Suppress warnings about use of MTLArgumentType
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
 namespace igl::metal {
 
 class RenderPipelineReflection final : public IRenderPipelineReflection {
@@ -47,3 +51,5 @@ class RenderPipelineReflection final : public IRenderPipelineReflection {
 };
 
 } // namespace igl::metal
+
+#pragma GCC diagnostic pop
diff --git a/src/igl/metal/RenderPipelineState.h b/src/igl/metal/RenderPipelineState.h
@@ -11,7 +11,6 @@
 #include <igl/Common.h>
 #include <igl/RenderPipelineState.h>
 #include <igl/metal/RenderPipelineReflection.h>
-
 namespace igl::metal {
 
 class RenderPipelineState final : public IRenderPipelineState {

diff --git a/src/igl/opengl/glx/Context.cpp b/src/igl/opengl/glx/Context.cpp
@@ -19,7 +19,7 @@
 
 namespace {
 
-int GetLastError() {
+[[maybe_unused]] int GetLastError() {
   return 0; // TODO: implement error handling
 }
 
@@ -148,8 +148,6 @@ Context::Context(std::shared_ptr<GLXSharedModule> module,
   static int visualAttribs[] = {None};
   int contextAttribs[] = {GLX_CONTEXT_MAJOR_VERSION_ARB, 4, GLX_CONTEXT_MINOR_VERSION_ARB, 6, None};
 
-  GLXPbuffer pbuf;
-
   if (display_ = module_->XOpenDisplay(0); display_ != nullptr) {
     int fbcount = 0;
     if (GLXFBConfig* fbc = module_->glXChooseFBConfig(

diff --git a/src/igl/opengl/wgl/Context.cpp b/src/igl/opengl/wgl/Context.cpp
@@ -11,10 +11,12 @@
 
 #include <igl/opengl/Texture.h>
 
+#if !defined(WIN32_LEAN_AND_MEAN)
 #define WIN32_LEAN_AND_MEAN
+#endif
 #if !defined(NOMINMAX)
 #define NOMINMAX
-#endif // NOMINMAX
+#endif // !defined(NOMINMAX)
 #include <windows.h>
 #ifdef DISABLE_WGL_VSYNC
 #include <GL/wglext.h>

diff --git a/src/igl/tests/metal/RenderPipelineReflection.mm b/src/igl/tests/metal/RenderPipelineReflection.mm
@@ -89,11 +89,15 @@ void SetUp() override {
     MTLRenderPipelineReflection* reflection = nil;
     auto device_ = MTLCreateSystemDefaultDevice();
 
+// Suppress warnings about MTLPipelineOptionArgumentInfo being deprecated
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     // Create reflection for use later in binding, etc.
     [device_ newRenderPipelineStateWithDescriptor:metalDesc
                                           options:MTLPipelineOptionArgumentInfo
                                        reflection:&reflection
                                             error:&error];
+#pragma GCC diagnostic pop
 
     pipeRef_ = std::make_shared<metal::RenderPipelineReflection>(reflection);
     ASSERT_NE(pipeRef_, nullptr);

diff --git a/src/igl/tests/metal/RenderPipelineState.mm b/src/igl/tests/metal/RenderPipelineState.mm
@@ -92,6 +92,9 @@ void SetUp() override {
     pipelineDesc_.frontFaceWinding = igl::WindingMode::CounterClockwise;
     pipelineDesc_.polygonFillMode = PolygonFillMode::Fill;
 
+// Suppress warnings about MTLPipelineOptionArgumentInfo being deprecated
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     // Create reflection for use later in binding, etc.
     id<MTLRenderPipelineState> metalObject =
         [device_ newRenderPipelineStateWithDescriptor:metalDesc
@@ -107,6 +110,7 @@ void SetUp() override {
                                               options:MTLPipelineOptionArgumentInfo
                                            reflection:nullptr
                                                 error:&error];
+#pragma GCC diagnostic pop
 
     pipeStateWithNoRefl_ = std::make_shared<metal::RenderPipelineState>(
         metalObjectWithoutRefl, nullptr, pipelineDesc_);