cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internal change

Browse Source 
PiperOrigin-RevId: 488795920
This commit is contained in:
Camillo Lugaresi 2022-11-15 16:57:46 -08:00 committed by Copybara-Service
parent 1beca61650
commit 7e19bbe35c
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediapipe/gpu/gl_texture_buffer.h
View File

@ -143,6 +143,10 @@ class GlTextureBuffer
return producer_context_; return producer_context_;
} }
#if MEDIAPIPE_GPU_BUFFER_USE_CV_PIXEL_BUFFER
static constexpr bool kDisableGpuBufferRegistration = true;
#endif // MEDIAPIPE_GPU_BUFFER_USE_CV_PIXEL_BUFFER
private: private:
// Creates a texture of dimensions width x height and allocates space for it. // Creates a texture of dimensions width x height and allocates space for it.
// If data is provided, it is uploaded to the texture; otherwise, it can be // If data is provided, it is uploaded to the texture; otherwise, it can be

20
mediapipe/gpu/gpu_buffer_storage.h
View File

@ -84,11 +84,17 @@ class GpuBufferStorageRegistry {
template <class Storage, class F> template <class Storage, class F>
RegistryToken RegisterFactory(F&& factory) { RegistryToken RegisterFactory(F&& factory) {
if constexpr (kDisableRegistration<Storage>) {
return {};
}
return Register(factory, Storage::GetProviderTypes()); return Register(factory, Storage::GetProviderTypes());
} }
template <class StorageFrom, class StorageTo, class F> template <class StorageFrom, class StorageTo, class F>
RegistryToken RegisterConverter(F&& converter) { RegistryToken RegisterConverter(F&& converter) {
if constexpr (kDisableRegistration<StorageTo>) {
return {};
}
return Register( return Register(
[converter](std::shared_ptr<GpuBufferStorage> source) [converter](std::shared_ptr<GpuBufferStorage> source)
-> std::shared_ptr<GpuBufferStorage> { -> std::shared_ptr<GpuBufferStorage> {
@ -119,6 +125,13 @@ class GpuBufferStorageRegistry {
return std::make_shared<Storage>(args...); return std::make_shared<Storage>(args...);
} }
// Temporary workaround: a Storage class can define a static constexpr
// kDisableGpuBufferRegistration member to true to prevent registering any
// factory of converter that would produce it.
// TODO: better solution for storage priorities.
template <class Storage, typename = void>
static constexpr bool kDisableRegistration = false;
RegistryToken Register(StorageFactory factory, RegistryToken Register(StorageFactory factory,
std::vector<TypeId> provider_hashes); std::vector<TypeId> provider_hashes);
RegistryToken Register(StorageConverter converter, RegistryToken Register(StorageConverter converter,
@ -130,6 +143,13 @@ class GpuBufferStorageRegistry {
converter_for_view_provider_and_existing_storage_; converter_for_view_provider_and_existing_storage_;
}; };
// Putting this outside the class body to work around a GCC bug.
// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71954
template <class Storage>
constexpr bool GpuBufferStorageRegistry::kDisableRegistration<
Storage, std::void_t<decltype(&Storage::kDisableGpuBufferRegistration)>> =
Storage::kDisableGpuBufferRegistration;
// Defining a member of this type causes P to be ODR-used, which forces its // Defining a member of this type causes P to be ODR-used, which forces its
// instantiation if it's a static member of a template. // instantiation if it's a static member of a template.
template <auto* P> template <auto* P>