CUDA のビルド・エラーを修正するマクロをヘッダーで include するのを止める

shiguredo · Jan 26, 2024 · be3a060 · be3a060
1 parent a215b95
commit be3a060
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/src/cuda_context_cuda.cpp b/src/cuda_context_cuda.cpp
@@ -1,3 +1,5 @@
+#include "sora/fix_cuda_noinline_macro_error.h"
+
 #include "sora/cuda_context.h"
 
 #if !USE_NVCODEC_ENCODER

diff --git a/src/hwenc_nvcodec/nvcodec_h264_encoder.cpp b/src/hwenc_nvcodec/nvcodec_h264_encoder.cpp
@@ -1,3 +1,5 @@
+#include "sora/fix_cuda_noinline_macro_error.h"
+
 #include "sora/hwenc_nvcodec/nvcodec_h264_encoder.h"
 
 #ifdef _WIN32

diff --git a/src/hwenc_nvcodec/nvcodec_h264_encoder_cuda.cpp b/src/hwenc_nvcodec/nvcodec_h264_encoder_cuda.cpp
@@ -1,3 +1,5 @@
+#include "sora/fix_cuda_noinline_macro_error.h"
+
 #include "nvcodec_h264_encoder_cuda.h"
 
 #include <iostream>

diff --git a/third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp b/third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp
@@ -9,6 +9,8 @@
 *
 */
 
+#include "sora/fix_cuda_noinline_macro_error.h"
+
 #include <algorithm>
 #include <chrono>
 #include <cmath>

diff --git a/third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp b/third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp
@@ -9,6 +9,8 @@
 *
 */
 
+#include "sora/fix_cuda_noinline_macro_error.h"
+
 #include "NvEncoder/NvEncoderCuda.h"
 #include "sora/dyn/cuda.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ @@
     *
     */
+    #include "sora/fix_cuda_noinline_macro_error.h"
     #include "NvEncoder/NvEncoderCuda.h"
     #include "sora/dyn/cuda.h"
@@ Expand Down @@