diff --git a/source/filters/filter-autoframing.cpp b/source/filters/filter-autoframing.cpp index c98ec47..f3f9859 100644 --- a/source/filters/filter-autoframing.cpp +++ b/source/filters/filter-autoframing.cpp @@ -457,7 +457,7 @@ void autoframing_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler0{::streamfx::obs::gs::debug_color_source, "StreamFX Auto-Framing"}; ::streamfx::obs::gs::debug_marker profiler0_0{::streamfx::obs::gs::debug_color_gray, "'%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(parent)}; @@ -516,7 +516,7 @@ void autoframing_instance::video_render(gs_effect_t* effect) } { // Draw the result for the next filter to use. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_render, "Render"}; #endif diff --git a/source/filters/filter-blur.cpp b/source/filters/filter-blur.cpp index ebb9811..7d43b4f 100644 --- a/source/filters/filter-blur.cpp +++ b/source/filters/filter-blur.cpp @@ -390,7 +390,7 @@ void blur_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Blur '%s'", obs_source_get_name(_self)}; #endif @@ -398,7 +398,7 @@ void blur_instance::video_render(gs_effect_t* effect) if (!_source_rendered) { // Source To Texture { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_cache, "Cache"}; #endif @@ -448,7 +448,7 @@ void blur_instance::video_render(gs_effect_t* effect) if (!_output_rendered) { { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "Blur"}; #endif @@ -458,7 +458,7 @@ void blur_instance::video_render(gs_effect_t* effect) // Mask if (_mask.enabled) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "Mask"}; #endif @@ -516,7 +516,7 @@ void blur_instance::video_render(gs_effect_t* effect) } } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_capture, "Capture '%s'", obs_source_get_name(_mask.source.source_texture->get_object())}; #endif @@ -552,7 +552,7 @@ void blur_instance::video_render(gs_effect_t* effect) // Draw source { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_render, "Render"}; #endif diff --git a/source/filters/filter-color-grade.cpp b/source/filters/filter-color-grade.cpp index e3a5182..0a19f89 100644 --- a/source/filters/filter-color-grade.cpp +++ b/source/filters/filter-color-grade.cpp @@ -282,7 +282,7 @@ void color_grade_instance::prepare_effect() void color_grade_instance::rebuild_lut() { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_cache, "Rebuild LUT"}; #endif @@ -356,7 +356,7 @@ void color_grade_instance::video_render(gs_effect_t* shader) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Color Grading '%s'", obs_source_get_name(_self)}; #endif @@ -366,7 +366,7 @@ void color_grade_instance::video_render(gs_effect_t* shader) // 1. Capture the filter/source rendered above this. if (!_ccache_fresh || !_ccache_texture) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_cache, "Cache '%s'", obs_source_get_name(target)}; #endif @@ -422,7 +422,7 @@ void color_grade_instance::video_render(gs_effect_t* shader) // 2. Apply one of the two rendering methods (LUT or Direct). if (_lut_initialized && _lut_enabled) { // Try to apply with the LUT based method. try { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "LUT Rendering"}; #endif // If the LUT was changed, rebuild the LUT first. @@ -488,7 +488,7 @@ void color_grade_instance::video_render(gs_effect_t* shader) } } if ((!_lut_initialized || !_lut_enabled) && !_cache_fresh) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "Direct Rendering"}; #endif // Reallocate the rendertarget if necessary. @@ -544,7 +544,7 @@ void color_grade_instance::video_render(gs_effect_t* shader) // 3. Render the output cache. { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_cache_render, "Draw Cache"}; #endif // Revert GPU status to what OBS Studio expects. diff --git a/source/filters/filter-denoising.cpp b/source/filters/filter-denoising.cpp index ac8f19a..72754e2 100644 --- a/source/filters/filter-denoising.cpp +++ b/source/filters/filter-denoising.cpp @@ -244,7 +244,7 @@ void denoising_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler0{::streamfx::obs::gs::debug_color_source, "StreamFX Denoising"}; ::streamfx::obs::gs::debug_marker profiler0_0{::streamfx::obs::gs::debug_color_gray, "'%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(parent)}; @@ -267,7 +267,7 @@ void denoising_instance::video_render(gs_effect_t* effect) } { // Capture the incoming frame. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_capture, "Capture"}; #endif if (obs_source_process_filter_begin(_self, GS_RGBA, OBS_ALLOW_DIRECT_RENDERING)) { @@ -289,7 +289,7 @@ void denoising_instance::video_render(gs_effect_t* effect) gs_set_cull_mode(GS_NEITHER); // Render -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler2{::streamfx::obs::gs::debug_color_capture, "Storage"}; #endif obs_source_process_filter_end(_self, obs_get_base_effect(OBS_EFFECT_DEFAULT), 1, 1); @@ -304,7 +304,7 @@ void denoising_instance::video_render(gs_effect_t* effect) } try { // Process the captured input with the provider. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Process"}; #endif switch (_provider) { @@ -335,7 +335,7 @@ void denoising_instance::video_render(gs_effect_t* effect) } { // Draw the result for the next filter to use. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_render, "Render"}; #endif if (_standard_effect->has_parameter("InputA", ::streamfx::obs::gs::effect_parameter::type::Texture)) { diff --git a/source/filters/filter-displacement.cpp b/source/filters/filter-displacement.cpp index 7e35e06..38d03ef 100644 --- a/source/filters/filter-displacement.cpp +++ b/source/filters/filter-displacement.cpp @@ -113,7 +113,7 @@ void displacement_instance::video_render(gs_effect_t*) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Displacement Mapping '%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(obs_filter_get_parent(_self))}; #endif diff --git a/source/filters/filter-dynamic-mask.cpp b/source/filters/filter-dynamic-mask.cpp index 7e8535c..23a0902 100644 --- a/source/filters/filter-dynamic-mask.cpp +++ b/source/filters/filter-dynamic-mask.cpp @@ -299,7 +299,7 @@ void dynamic_mask_instance::video_render(gs_effect_t* in_effect) uint32_t height = obs_source_get_base_height(target); auto input = _input.lock(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Dynamic Mask '%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(obs_filter_get_parent(_self))}; #endif @@ -315,7 +315,7 @@ void dynamic_mask_instance::video_render(gs_effect_t* in_effect) // Capture the base texture for later rendering. if (!_have_base) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_cache, "Base Texture"}; #endif // Ensure the Render Target matches the expected format. @@ -401,7 +401,7 @@ void dynamic_mask_instance::video_render(gs_effect_t* in_effect) _input_color_format = _base_color_format; _input_color_space = _base_color_space; } else { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_source, "Input '%s'", input.name().data()}; #endif @@ -475,7 +475,7 @@ void dynamic_mask_instance::video_render(gs_effect_t* in_effect) // Capture the final texture. if (!_have_final && _have_base) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_render, "Final Calculation"}; #endif @@ -574,7 +574,7 @@ void dynamic_mask_instance::video_render(gs_effect_t* in_effect) // Draw source { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_render, "Render"}; #endif diff --git a/source/filters/filter-sdf-effects.cpp b/source/filters/filter-sdf-effects.cpp index dbe3362..16ed485 100644 --- a/source/filters/filter-sdf-effects.cpp +++ b/source/filters/filter-sdf-effects.cpp @@ -314,7 +314,7 @@ void sdf_effects_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "SDF Effects '%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(obs_filter_get_parent(_self))}; #endif @@ -340,7 +340,7 @@ void sdf_effects_instance::video_render(gs_effect_t* effect) if (!_source_rendered) { // Store input texture. { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_cache, "Cache"}; #endif @@ -382,7 +382,7 @@ void sdf_effects_instance::video_render(gs_effect_t* effect) } { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "Update Distance Field"}; #endif @@ -441,7 +441,7 @@ void sdf_effects_instance::video_render(gs_effect_t* effect) // Optimized Render path. try { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "Calculate"}; #endif @@ -538,7 +538,7 @@ void sdf_effects_instance::video_render(gs_effect_t* effect) } { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_render, "Render"}; #endif diff --git a/source/filters/filter-shader.cpp b/source/filters/filter-shader.cpp index 8bb8c85..f9d8a02 100644 --- a/source/filters/filter-shader.cpp +++ b/source/filters/filter-shader.cpp @@ -92,14 +92,14 @@ void shader_instance::video_render(gs_effect_t* effect) throw std::runtime_error("No effect, or invalid base size."); } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Shader Filter '%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(obs_filter_get_parent(_self))}; #endif { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_source, "Cache"}; #endif @@ -128,7 +128,7 @@ void shader_instance::video_render(gs_effect_t* effect) } { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_render, "Render"}; #endif diff --git a/source/filters/filter-transform.cpp b/source/filters/filter-transform.cpp index 6d64803..8031820 100644 --- a/source/filters/filter-transform.cpp +++ b/source/filters/filter-transform.cpp @@ -383,7 +383,7 @@ void transform_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "3D Transform '%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(obs_filter_get_parent(_self))}; #endif @@ -411,7 +411,7 @@ void transform_instance::video_render(gs_effect_t* effect) } if (!_cache_rendered) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_cache, "Cache"}; #endif @@ -451,13 +451,13 @@ void transform_instance::video_render(gs_effect_t* effect) } if (_mipmap_enabled) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "Mipmap"}; #endif if (!_mipmap_texture || (_mipmap_texture->get_width() != cache_width) || (_mipmap_texture->get_height() != cache_height)) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdr{streamfx::obs::gs::debug_color_allocate, "Allocate Mipmapped Texture"}; #endif @@ -476,7 +476,7 @@ void transform_instance::video_render(gs_effect_t* effect) } { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_convert, "Transform"}; #endif @@ -564,7 +564,7 @@ void transform_instance::video_render(gs_effect_t* effect) } { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdm{streamfx::obs::gs::debug_color_render, "Render"}; #endif diff --git a/source/filters/filter-upscaling.cpp b/source/filters/filter-upscaling.cpp index 5915f18..d471fda 100644 --- a/source/filters/filter-upscaling.cpp +++ b/source/filters/filter-upscaling.cpp @@ -244,7 +244,7 @@ void upscaling_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler0{::streamfx::obs::gs::debug_color_source, "StreamFX Upscaling"}; ::streamfx::obs::gs::debug_marker profiler0_0{::streamfx::obs::gs::debug_color_gray, "'%s' on '%s'", obs_source_get_name(_self), obs_source_get_name(parent)}; @@ -255,7 +255,7 @@ void upscaling_instance::video_render(gs_effect_t* effect) std::unique_lock ul(_provider_lock); { // Capture the incoming frame. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_capture, "Capture"}; #endif if (obs_source_process_filter_begin(_self, GS_RGBA, OBS_ALLOW_DIRECT_RENDERING)) { @@ -277,7 +277,7 @@ void upscaling_instance::video_render(gs_effect_t* effect) gs_set_cull_mode(GS_NEITHER); // Render -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler2{::streamfx::obs::gs::debug_color_capture, "Storage"}; #endif obs_source_process_filter_end(_self, obs_get_base_effect(OBS_EFFECT_DEFAULT), 1, 1); @@ -292,7 +292,7 @@ void upscaling_instance::video_render(gs_effect_t* effect) } try { // Process the captured input with the provider. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Process"}; #endif switch (_provider) { @@ -320,7 +320,7 @@ void upscaling_instance::video_render(gs_effect_t* effect) } { // Draw the result for the next filter to use. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_render, "Render"}; #endif if (_standard_effect->has_parameter("InputA", ::streamfx::obs::gs::effect_parameter::type::Texture)) { diff --git a/source/filters/filter-virtual-greenscreen.cpp b/source/filters/filter-virtual-greenscreen.cpp index 3565180..d6a4a31 100644 --- a/source/filters/filter-virtual-greenscreen.cpp +++ b/source/filters/filter-virtual-greenscreen.cpp @@ -251,7 +251,7 @@ void virtual_greenscreen_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler0{::streamfx::obs::gs::debug_color_source, "StreamFX Virtual Green-Screen"}; ::streamfx::obs::gs::debug_marker profiler0_0{::streamfx::obs::gs::debug_color_gray, "'%s' on '%s'", @@ -263,7 +263,7 @@ void virtual_greenscreen_instance::video_render(gs_effect_t* effect) std::unique_lock ul(_provider_lock); { // Capture the incoming frame. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_capture, "Capture"}; #endif if (obs_source_process_filter_begin(_self, GS_RGBA, OBS_ALLOW_DIRECT_RENDERING)) { @@ -285,7 +285,7 @@ void virtual_greenscreen_instance::video_render(gs_effect_t* effect) gs_set_cull_mode(GS_NEITHER); // Render -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler2{::streamfx::obs::gs::debug_color_capture, "Storage"}; #endif obs_source_process_filter_end(_self, obs_get_base_effect(OBS_EFFECT_DEFAULT), 1, 1); @@ -303,7 +303,7 @@ void virtual_greenscreen_instance::video_render(gs_effect_t* effect) } try { // Process the captured input with the provider. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Process"}; #endif switch (_provider) { @@ -324,7 +324,7 @@ void virtual_greenscreen_instance::video_render(gs_effect_t* effect) } { // Draw the result for the next filter to use. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_render, "Render"}; #endif if (_effect->has_parameter("InputA", ::streamfx::obs::gs::effect_parameter::type::Texture)) { diff --git a/source/gfx/blur/gfx-blur-box-linear.cpp b/source/gfx/blur/gfx-blur-box-linear.cpp index 46a4fb3..a11a8e0 100644 --- a/source/gfx/blur/gfx-blur-box-linear.cpp +++ b/source/gfx/blur/gfx-blur-box-linear.cpp @@ -234,7 +234,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box_linear::r { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Box Linear Blur"); #endif @@ -265,7 +265,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box_linear::r effect.get_parameter("pSizeInverseMul").set_float(float_t(1.0f / (float_t(_size) * 2.0f + 1.0f))); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Horizontal"); #endif @@ -281,7 +281,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box_linear::r effect.get_parameter("pImageTexel").set_float2(0., float_t(1.f / height)); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Vertical"); #endif @@ -324,7 +324,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box_linear_di { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Box Linear Directional Blur"); #endif diff --git a/source/gfx/blur/gfx-blur-box.cpp b/source/gfx/blur/gfx-blur-box.cpp index d894913..b397e40 100644 --- a/source/gfx/blur/gfx-blur-box.cpp +++ b/source/gfx/blur/gfx-blur-box.cpp @@ -244,7 +244,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box::render() { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Box Blur"); #endif @@ -275,7 +275,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box::render() effect.get_parameter("pSizeInverseMul").set_float(float_t(1.0f / (float_t(_size) * 2.0f + 1.0f))); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Horizontal"); #endif @@ -291,7 +291,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box::render() effect.get_parameter("pImageTexel").set_float2(0.f, float_t(1.f / height)); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Vertical"); #endif @@ -334,7 +334,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box_direction { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Box Directional Blur"); #endif @@ -409,7 +409,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box_rotationa { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Box Rotational Blur"); #endif @@ -475,7 +475,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::box_zoom::ren { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Box Zoom Blur"); #endif diff --git a/source/gfx/blur/gfx-blur-dual-filtering.cpp b/source/gfx/blur/gfx-blur-dual-filtering.cpp index 85ef28e..6725264 100644 --- a/source/gfx/blur/gfx-blur-dual-filtering.cpp +++ b/source/gfx/blur/gfx-blur-dual-filtering.cpp @@ -216,7 +216,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::dual_filterin { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Dual-Filtering Blur"); #endif @@ -244,7 +244,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::dual_filterin // Downsample for (std::size_t n = 1; n <= iterations; n++) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Down %" PRIuMAX, n); #endif @@ -281,7 +281,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::dual_filterin // Upsample for (std::size_t n = iterations; n > 0; n--) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Up %" PRIuMAX, n); #endif diff --git a/source/gfx/blur/gfx-blur-gaussian-linear.cpp b/source/gfx/blur/gfx-blur-gaussian-linear.cpp index 65c2580..1d3a8fd 100644 --- a/source/gfx/blur/gfx-blur-gaussian-linear.cpp +++ b/source/gfx/blur/gfx-blur-gaussian-linear.cpp @@ -285,7 +285,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian_line { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Gaussian Linear Blur"); #endif @@ -323,7 +323,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian_line effect.get_parameter("pImageTexel").set_float2(float_t(1.f / width), 0.f); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Horizontal"); #endif @@ -343,7 +343,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian_line effect.get_parameter("pImageTexel").set_float2(0.f, float_t(1.f / height)); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Vertical"); #endif @@ -390,7 +390,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian_line { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Gaussian Linear Directional Blur"); #endif diff --git a/source/gfx/blur/gfx-blur-gaussian.cpp b/source/gfx/blur/gfx-blur-gaussian.cpp index fef864a..91f2731 100644 --- a/source/gfx/blur/gfx-blur-gaussian.cpp +++ b/source/gfx/blur/gfx-blur-gaussian.cpp @@ -313,7 +313,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian::ren { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Gaussian Blur"); #endif @@ -351,7 +351,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian::ren effect.get_parameter("pImageTexel").set_float2(float_t(1.f / width), 0.f); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Horizontal"); #endif @@ -371,7 +371,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian::ren effect.get_parameter("pImageTexel").set_float2(0.f, float_t(1.f / height)); { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdm = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Vertical"); #endif @@ -418,7 +418,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian_dire { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Gaussian Directional Blur"); #endif @@ -476,7 +476,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian_rota { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Gaussian Rotational Blur"); #endif @@ -558,7 +558,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> streamfx::gfx::blur::gaussian_zoom { auto gctx = streamfx::obs::gs::context(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto gdmp = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_azure_radiance, "Gaussian Zoom Blur"); #endif diff --git a/source/gfx/gfx-mipmapper.cpp b/source/gfx/gfx-mipmapper.cpp index 5486c4f..e935d79 100644 --- a/source/gfx/gfx-mipmapper.cpp +++ b/source/gfx/gfx-mipmapper.cpp @@ -249,7 +249,7 @@ void streamfx::gfx::mipmapper::rebuild(std::shared_ptr streamfx::gfx::source_texture::rende } if (_child) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG auto cctr = streamfx::obs::gs::debug_marker(streamfx::obs::gs::debug_color_capture, "gfx::source_texture '%s'", obs_source_get_name(_child.get())); #endif diff --git a/source/gfx/shader/gfx-shader-param-texture.cpp b/source/gfx/shader/gfx-shader-param-texture.cpp index 2950919..68f5d45 100644 --- a/source/gfx/shader/gfx-shader-param-texture.cpp +++ b/source/gfx/shader/gfx-shader-param-texture.cpp @@ -329,7 +329,7 @@ void streamfx::gfx::shader::texture_parameter::assign() // If this is a source and active or visible, capture it. if ((_type == texture_type::Source) && (_active || _visible) && _source_rendertarget) { auto source = _source.lock(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_capture, "Parameter '%s'", get_key().data()}; ::streamfx::obs::gs::debug_marker profiler2{::streamfx::obs::gs::debug_color_capture, "Capture '%s'", diff --git a/source/gfx/shader/gfx-shader.cpp b/source/gfx/shader/gfx-shader.cpp index 14a2596..3ecd30b 100644 --- a/source/gfx/shader/gfx-shader.cpp +++ b/source/gfx/shader/gfx-shader.cpp @@ -500,7 +500,7 @@ void streamfx::gfx::shader::shader::render(gs_effect* effect) effect = obs_get_base_effect(OBS_EFFECT_DEFAULT); if (!_rt_up_to_date) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_cache, "Render Cache"}; #endif @@ -536,7 +536,7 @@ void streamfx::gfx::shader::shader::render(gs_effect* effect) } if (auto tex = _rt->get_texture(); tex) { -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_render, "Draw Cache"}; #endif diff --git a/source/nvidia/ar/nvidia-ar-facedetection.cpp b/source/nvidia/ar/nvidia-ar-facedetection.cpp index 748f32e..3f2e83e 100644 --- a/source/nvidia/ar/nvidia-ar-facedetection.cpp +++ b/source/nvidia/ar/nvidia-ar-facedetection.cpp @@ -106,7 +106,7 @@ void ar::facedetection::process(std::shared_ptr<::streamfx::obs::gs::texture> in auto gctx = ::streamfx::obs::gs::context(); auto cctx = _nvcuda->get_context()->enter(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_magenta, "NvAR Face Detection"}; #endif @@ -119,14 +119,14 @@ void ar::facedetection::process(std::shared_ptr<::streamfx::obs::gs::texture> in } { // Copy parameter to input. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy In -> Input"}; #endif gs_copy_texture(_input->get_texture()->get_object(), in->get_object()); } { // Convert Input to Source format -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Copy Input -> Source"}; #endif if (auto res = _nvcv->NvCVImage_Transfer(_input->get_image(), _source->get_image(), 1.f, @@ -139,7 +139,7 @@ void ar::facedetection::process(std::shared_ptr<::streamfx::obs::gs::texture> in } { // Run -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_cache, "Run"}; #endif if (auto err = run(); err != cv::result::SUCCESS) { diff --git a/source/nvidia/vfx/nvidia-vfx-denoising.cpp b/source/nvidia/vfx/nvidia-vfx-denoising.cpp index 1811b11..2c6ab51 100644 --- a/source/nvidia/vfx/nvidia-vfx-denoising.cpp +++ b/source/nvidia/vfx/nvidia-vfx-denoising.cpp @@ -111,7 +111,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> auto gctx = ::streamfx::obs::gs::context(); auto cctx = _nvcuda->get_context()->enter(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_magenta, "NvVFX Denoising"}; #endif @@ -124,14 +124,14 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Copy parameter to input. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy In -> Input"}; #endif gs_copy_texture(_input->get_texture()->get_object(), in->get_object()); } { // Convert Input to Source format -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Convert Input -> Source"}; #endif @@ -145,7 +145,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Copy input to source. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy Input -> Source"}; #endif if (auto res = _nvcvi->NvCVImage_Transfer(_convert_to_fp32->get_image(), _source->get_image(), 1.f, @@ -158,7 +158,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Process source to destination. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_cache, "Process"}; #endif if (auto res = _nvvfx->NvVFX_Run(_fx.get(), 0); res != ::streamfx::nvidia::cv::result::SUCCESS) { @@ -168,7 +168,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Convert Destination to Output format -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Convert Destination -> Output"}; #endif @@ -182,7 +182,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Copy destination to output. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy Destination -> Output"}; #endif diff --git a/source/nvidia/vfx/nvidia-vfx-greenscreen.cpp b/source/nvidia/vfx/nvidia-vfx-greenscreen.cpp index 84827d2..c2be92c 100644 --- a/source/nvidia/vfx/nvidia-vfx-greenscreen.cpp +++ b/source/nvidia/vfx/nvidia-vfx-greenscreen.cpp @@ -92,7 +92,7 @@ std::shared_ptr auto gctx = ::streamfx::obs::gs::context(); auto cctx = _nvcuda->get_context()->enter(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_magenta, "NvVFX Background Removal"}; #endif @@ -105,7 +105,7 @@ std::shared_ptr } { // Copy parameter to input. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy In -> Input"}; #endif gs_copy_texture(_input->get_texture()->get_object(), in->get_object()); @@ -119,7 +119,7 @@ std::shared_ptr } { // Copy input to source. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy Input -> Source"}; #endif if (auto res = _nvcvi->NvCVImage_Transfer(_input->get_image(), _source->get_image(), 1.f, @@ -132,7 +132,7 @@ std::shared_ptr } { // Process source to destination. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_cache, "Process"}; #endif if (auto res = run(); res != ::streamfx::nvidia::cv::result::SUCCESS) { @@ -142,7 +142,7 @@ std::shared_ptr } { // Copy destination to output. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy Destination -> Output"}; #endif diff --git a/source/nvidia/vfx/nvidia-vfx-superresolution.cpp b/source/nvidia/vfx/nvidia-vfx-superresolution.cpp index ce7a293..f46ab7d 100644 --- a/source/nvidia/vfx/nvidia-vfx-superresolution.cpp +++ b/source/nvidia/vfx/nvidia-vfx-superresolution.cpp @@ -214,7 +214,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> auto gctx = ::streamfx::obs::gs::context(); auto cctx = _nvcuda->get_context()->enter(); -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_magenta, "NvVFX Super-Resolution"}; #endif @@ -227,14 +227,14 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Copy parameter to input. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy In -> Input"}; #endif gs_copy_texture(_input->get_texture()->get_object(), in->get_object()); } { // Convert Input to Source format -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Convert Input -> Source"}; #endif @@ -248,7 +248,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Copy input to source. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy Input -> Source"}; #endif if (auto res = _nvcvi->NvCVImage_Transfer(_convert_to_fp32->get_image(), _source->get_image(), 1.f, @@ -261,7 +261,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Process source to destination. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_cache, "Process"}; #endif if (auto res = run(); res != ::streamfx::nvidia::cv::result::SUCCESS) { @@ -271,7 +271,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Convert Destination to Output format -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_convert, "Convert Destination -> Output"}; #endif @@ -285,7 +285,7 @@ std::shared_ptr<::streamfx::obs::gs::texture> } { // Copy destination to output. -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG ::streamfx::obs::gs::debug_marker profiler1{::streamfx::obs::gs::debug_color_copy, "Copy Destination -> Output"}; #endif diff --git a/source/obs/gs/gs-helper.hpp b/source/obs/gs/gs-helper.hpp index 17047fe..d802af4 100644 --- a/source/obs/gs/gs-helper.hpp +++ b/source/obs/gs/gs-helper.hpp @@ -25,7 +25,7 @@ namespace streamfx::obs::gs { } }; -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG static constexpr float_t debug_color_white[4] = {1.f, 1.f, 1.f, 1.f}; static constexpr float_t debug_color_gray[4] = {.5f, .5f, .5f, 1.f}; static constexpr float_t debug_color_black[4] = {0.f, 0.f, 0.f, 1.f}; diff --git a/source/sources/source-mirror.cpp b/source/sources/source-mirror.cpp index bfaf51a..bd7501a 100644 --- a/source/sources/source-mirror.cpp +++ b/source/sources/source-mirror.cpp @@ -151,7 +151,7 @@ void mirror_instance::video_render(gs_effect_t* effect) if ((obs_source_get_output_flags(_source.get()) & OBS_SOURCE_VIDEO) == 0) return; -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Source Mirror '%s' for '%s'", obs_source_get_name(_self), obs_source_get_name(_source.get())}; #endif diff --git a/source/sources/source-shader.cpp b/source/sources/source-shader.cpp index a7a0e1e..f647468 100644 --- a/source/sources/source-shader.cpp +++ b/source/sources/source-shader.cpp @@ -86,7 +86,7 @@ void shader_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Shader Source '%s'", obs_source_get_name(_self)}; #endif diff --git a/source/transitions/transition-shader.cpp b/source/transitions/transition-shader.cpp index 28d8611..ba25f8c 100644 --- a/source/transitions/transition-shader.cpp +++ b/source/transitions/transition-shader.cpp @@ -87,7 +87,7 @@ void shader_instance::video_render(gs_effect_t* effect) return; } -#ifdef ENABLE_PROFILING +#if defined(ENABLE_PROFILING) && !defined(D_PLATFORM_MAC) && _DEBUG streamfx::obs::gs::debug_marker gdmp{streamfx::obs::gs::debug_color_source, "Shader Transition '%s'", obs_source_get_name(_self)}; #endif