From be3a0608369bb0b7b9464f3dd57cc3ceef97bf97 Mon Sep 17 00:00:00 2001 From: enm10k Date: Fri, 26 Jan 2024 13:25:32 +0900 Subject: [PATCH] =?UTF-8?q?CUDA=20=E3=81=AE=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E3=83=BB=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=83=9E=E3=82=AF=E3=83=AD=E3=82=92=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=83=BC=E3=81=A7=20include=20=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E6=AD=A2=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/cuda_context_cuda.cpp | 2 ++ src/hwenc_nvcodec/nvcodec_h264_encoder.cpp | 2 ++ src/hwenc_nvcodec/nvcodec_h264_encoder_cuda.cpp | 2 ++ third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp | 2 ++ third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/cuda_context_cuda.cpp b/src/cuda_context_cuda.cpp index d7a11b96..d59437a4 100644 --- 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 index 01418039..ec24d935 100644 --- 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 index 7ebe497b..e5ba12a0 100644 --- 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 diff --git a/third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp b/third_party/NvCodec/NvCodec/NvDecoder/NvDecoder.cpp index c722f7b1..5eb86679 100644 --- 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 #include #include diff --git a/third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp b/third_party/NvCodec/NvCodec/NvEncoder/NvEncoderCuda.cpp index d038f636..1f11bf43 100644 --- 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"