From 000314a54597349b8b8b1c217659032bc09714bb Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Wed, 8 Nov 2023 12:15:02 -0800 Subject: [PATCH] No public description PiperOrigin-RevId: 580614241 --- mediapipe/framework/port.h | 2 +- mediapipe/gpu/gl_thread_collector.h | 2 +- .../calculators/tensors_to_segmentation_calculator.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mediapipe/framework/port.h b/mediapipe/framework/port.h index a18080637..e8b17e4d2 100644 --- a/mediapipe/framework/port.h +++ b/mediapipe/framework/port.h @@ -50,7 +50,7 @@ // but may or may not still be able to run other OpenGL code. #if !defined(MEDIAPIPE_DISABLE_GL_COMPUTE) && \ (defined(__APPLE__) || defined(__EMSCRIPTEN__) || MEDIAPIPE_DISABLE_GPU || \ - MEDIAPIPE_USING_SWIFTSHADER) + MEDIAPIPE_USING_LEGACY_SWIFTSHADER) #define MEDIAPIPE_DISABLE_GL_COMPUTE #endif diff --git a/mediapipe/gpu/gl_thread_collector.h b/mediapipe/gpu/gl_thread_collector.h index 58a35503c..2cc7aa57a 100644 --- a/mediapipe/gpu/gl_thread_collector.h +++ b/mediapipe/gpu/gl_thread_collector.h @@ -17,7 +17,7 @@ #include -#if defined(MEDIAPIPE_USING_SWIFTSHADER) +#if defined(MEDIAPIPE_USING_LEGACY_SWIFTSHADER) #define MEDIAPIPE_NEEDS_GL_THREAD_COLLECTOR 1 #endif diff --git a/mediapipe/tasks/cc/vision/image_segmenter/calculators/tensors_to_segmentation_calculator.cc b/mediapipe/tasks/cc/vision/image_segmenter/calculators/tensors_to_segmentation_calculator.cc index d449bb123..69f74b469 100644 --- a/mediapipe/tasks/cc/vision/image_segmenter/calculators/tensors_to_segmentation_calculator.cc +++ b/mediapipe/tasks/cc/vision/image_segmenter/calculators/tensors_to_segmentation_calculator.cc @@ -45,7 +45,7 @@ limitations under the License. #ifdef __EMSCRIPTEN__ #define TASK_SEGMENTATION_USE_GL_POSTPROCESSING 1 #elif MEDIAPIPE_OPENGL_ES_VERSION >= MEDIAPIPE_OPENGL_ES_31 && \ - !MEDIAPIPE_USING_SWIFTSHADER && defined(MEDIAPIPE_ANDROID) + !MEDIAPIPE_USING_LEGACY_SWIFTSHADER && defined(MEDIAPIPE_ANDROID) #define TASK_SEGMENTATION_USE_GL_POSTPROCESSING 1 #else #undef TASK_SEGMENTATION_USE_GL_POSTPROCESSING