conflict resolve

Author: cheneym2

tools/CMakeLists.txt

@@ -139,6 +139,7 @@ if(SLANG_ENABLE_GFX)
             stb
             $<$<BOOL:${SLANG_ENABLE_XLIB}>:X11::X11>
             $<$<BOOL:${SLANG_ENABLE_CUDA}>:CUDA::cuda_driver>
+            $<$<BOOL:${SLANG_ENABLE_NVAPI}>:${NVAPI_LIBRARIES}>
             SPIRV-Tools-link
         LINK_WITH_FRAMEWORK Foundation Cocoa QuartzCore Metal
         EXTRA_COMPILE_DEFINITIONS_PRIVATE

tools/gfx/renderer-shared.cpp

@@ -1136,7 +1136,8 @@ Result ShaderProgramBase::compileShaders(RendererBase* device)
         // glue code holding together the bits of precompiled target IR.
         // Collect those dependency target IRs too.
         ComPtr<slang::IModulePrecompileService_Experimental> componentPrecompileService;
-        if (entryPointComponent->queryInterface(
+printf("SKIP check componentPrecompileService\n");
+        if (false && entryPointComponent->queryInterface(
                 slang::IModulePrecompileService_Experimental::getTypeGuid(),
                 (void**)componentPrecompileService.writeRef()) == SLANG_OK)
         {