From 6345dfc8f3291f5b0a1988d8e90b397a8d2a8ab4 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 19 Apr 2019 15:10:30 -0700 Subject: [PATCH] gallium: Remove the "alt" pipebuffer manager interface. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This one would allocate from two underlying pools, but has never been used. Reviewed-by: Marek Olšák Reviewed-by: Jose Fonseca Reviewed-by: Kristian Høgsberg --- src/gallium/auxiliary/Makefile.sources | 1 - src/gallium/auxiliary/meson.build | 1 - src/gallium/auxiliary/pipebuffer/pb_bufmgr.h | 5 - .../auxiliary/pipebuffer/pb_bufmgr_alt.c | 120 ------------------ 4 files changed, 127 deletions(-) delete mode 100644 src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 634ba678fc7..b4705683c48 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -110,7 +110,6 @@ C_SOURCES := \ pipebuffer/pb_buffer_fenced.h \ pipebuffer/pb_buffer.h \ pipebuffer/pb_buffer_malloc.c \ - pipebuffer/pb_bufmgr_alt.c \ pipebuffer/pb_bufmgr_cache.c \ pipebuffer/pb_bufmgr_debug.c \ pipebuffer/pb_bufmgr.h \ diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 218c0f6fc51..ed0279abb98 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -130,7 +130,6 @@ files_libgallium = files( 'pipebuffer/pb_buffer_fenced.h', 'pipebuffer/pb_buffer.h', 'pipebuffer/pb_buffer_malloc.c', - 'pipebuffer/pb_bufmgr_alt.c', 'pipebuffer/pb_bufmgr_cache.c', 'pipebuffer/pb_bufmgr_debug.c', 'pipebuffer/pb_bufmgr.h', diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h index 45a1aa84f7d..78e0007adcd 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h @@ -172,11 +172,6 @@ fenced_bufmgr_create(struct pb_manager *provider, pb_size max_buffer_size, pb_size max_cpu_total_size); - -struct pb_manager * -pb_alt_manager_create(struct pb_manager *provider1, - struct pb_manager *provider2); - /** * Debug buffer manager to detect buffer under- and overflows. * diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c deleted file mode 100644 index f71bacc8820..00000000000 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_alt.c +++ /dev/null @@ -1,120 +0,0 @@ -/************************************************************************** - * - * Copyright 2007-2008 VMware, Inc. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR - * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - **************************************************************************/ - -/** - * \file - * Allocate buffers from two alternative buffer providers. - * - * \author Jose Fonseca - */ - - -#include "pipe/p_compiler.h" -#include "util/u_debug.h" -#include "util/u_memory.h" - -#include "pb_buffer.h" -#include "pb_bufmgr.h" - - -struct pb_alt_manager -{ - struct pb_manager base; - - struct pb_manager *provider1; - struct pb_manager *provider2; -}; - - -static inline struct pb_alt_manager * -pb_alt_manager(struct pb_manager *mgr) -{ - assert(mgr); - return (struct pb_alt_manager *)mgr; -} - - -static struct pb_buffer * -pb_alt_manager_create_buffer(struct pb_manager *_mgr, - pb_size size, - const struct pb_desc *desc) -{ - struct pb_alt_manager *mgr = pb_alt_manager(_mgr); - struct pb_buffer *buf; - - buf = mgr->provider1->create_buffer(mgr->provider1, size, desc); - if (buf) - return buf; - - buf = mgr->provider2->create_buffer(mgr->provider2, size, desc); - return buf; -} - - -static void -pb_alt_manager_flush(struct pb_manager *_mgr) -{ - struct pb_alt_manager *mgr = pb_alt_manager(_mgr); - - assert(mgr->provider1->flush); - if(mgr->provider1->flush) - mgr->provider1->flush(mgr->provider1); - - assert(mgr->provider2->flush); - if(mgr->provider2->flush) - mgr->provider2->flush(mgr->provider2); -} - - -static void -pb_alt_manager_destroy(struct pb_manager *mgr) -{ - FREE(mgr); -} - - -struct pb_manager * -pb_alt_manager_create(struct pb_manager *provider1, - struct pb_manager *provider2) -{ - struct pb_alt_manager *mgr; - - if(!provider1 || !provider2) - return NULL; - - mgr = CALLOC_STRUCT(pb_alt_manager); - if (!mgr) - return NULL; - - mgr->base.destroy = pb_alt_manager_destroy; - mgr->base.create_buffer = pb_alt_manager_create_buffer; - mgr->base.flush = pb_alt_manager_flush; - mgr->provider1 = provider1; - mgr->provider2 = provider2; - - return &mgr->base; -} -- 2.30.2