OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Remove the malloc pipebuffer manager.

Browse Source 
This has been unused since r600 stopped using it in 2010.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Kristian Høgsberg <hoegsberg@gmail.com>
This commit is contained in:
Eric Anholt
2019-04-19 15:19:58 -07:00
parent 6345dfc8f3
commit ec686a66db
4 changed files with 0 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gallium/auxiliary/Makefile.sources
View File

@@ -109,7 +109,6 @@ C_SOURCES := \
pipebuffer/pb_buffer_fenced.c \
pipebuffer/pb_buffer_fenced.h \
pipebuffer/pb_buffer.h \
pipebuffer/pb_buffer_malloc.c \
pipebuffer/pb_bufmgr_cache.c \
pipebuffer/pb_bufmgr_debug.c \
pipebuffer/pb_bufmgr.h \

1
src/gallium/auxiliary/meson.build
View File

@@ -129,7 +129,6 @@ files_libgallium = files(
'pipebuffer/pb_buffer_fenced.c',
'pipebuffer/pb_buffer_fenced.h',
'pipebuffer/pb_buffer.h',
'pipebuffer/pb_buffer_malloc.c',
'pipebuffer/pb_bufmgr_cache.c',
'pipebuffer/pb_bufmgr_debug.c',
'pipebuffer/pb_bufmgr.h',

198
src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
View File

@@ -1,198 +0,0 @@
/**************************************************************************
*
* Copyright 2007 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
* Implementation of malloc-based buffers to store data that can't be processed
* by the hardware.
*
* \author Jose Fonseca <jfonseca@vmware.com>
*/
#include "util/u_debug.h"
#include "util/u_memory.h"
#include "pb_buffer.h"
#include "pb_bufmgr.h"
struct malloc_buffer
{
struct pb_buffer base;
void *data;
};
extern const struct pb_vtbl malloc_buffer_vtbl;
static inline struct malloc_buffer *
malloc_buffer(struct pb_buffer *buf)
{
assert(buf);
if (!buf)
return NULL;
assert(buf->vtbl == &malloc_buffer_vtbl);
return (struct malloc_buffer *)buf;
}
static void
malloc_buffer_destroy(struct pb_buffer *buf)
{
align_free(malloc_buffer(buf)->data);
FREE(buf);
}
static void *
malloc_buffer_map(struct pb_buffer *buf,
enum pb_usage_flags flags,
void *flush_ctx)
{
return malloc_buffer(buf)->data;
}
static void
malloc_buffer_unmap(struct pb_buffer *buf)
{
/* No-op */
}
static enum pipe_error
malloc_buffer_validate(struct pb_buffer *buf,
struct pb_validate *vl,
enum pb_usage_flags flags)
{
assert(0);
return PIPE_ERROR;
}
static void
malloc_buffer_fence(struct pb_buffer *buf,
struct pipe_fence_handle *fence)
{
assert(0);
}
static void
malloc_buffer_get_base_buffer(struct pb_buffer *buf,
struct pb_buffer **base_buf,
pb_size *offset)
{
*base_buf = buf;
*offset = 0;
}
const struct pb_vtbl
malloc_buffer_vtbl = {
malloc_buffer_destroy,
malloc_buffer_map,
malloc_buffer_unmap,
malloc_buffer_validate,
malloc_buffer_fence,
malloc_buffer_get_base_buffer
};
struct pb_buffer *
pb_malloc_buffer_create(pb_size size,
const struct pb_desc *desc)
{
struct malloc_buffer *buf;
/* TODO: do a single allocation */
buf = CALLOC_STRUCT(malloc_buffer);
if (!buf)
return NULL;
pipe_reference_init(&buf->base.reference, 1);
buf->base.usage = desc->usage;
buf->base.size = size;
buf->base.alignment = desc->alignment;
buf->base.vtbl = &malloc_buffer_vtbl;
buf->data = align_malloc(size, desc->alignment < sizeof(void*) ? sizeof(void*) : desc->alignment);
if(!buf->data) {
FREE(buf);
return NULL;
}
return &buf->base;
}
static struct pb_buffer *
pb_malloc_bufmgr_create_buffer(struct pb_manager *mgr,
pb_size size,
const struct pb_desc *desc)
{
return pb_malloc_buffer_create(size, desc);
}
static void
pb_malloc_bufmgr_flush(struct pb_manager *mgr)
{
/* No-op */
}
static void
pb_malloc_bufmgr_destroy(struct pb_manager *mgr)
{
/* No-op */
}
static boolean
pb_malloc_bufmgr_is_buffer_busy( struct pb_manager *mgr,
struct pb_buffer *buf )
{
return FALSE;
}
static struct pb_manager
pb_malloc_bufmgr = {
pb_malloc_bufmgr_destroy,
pb_malloc_bufmgr_create_buffer,
pb_malloc_bufmgr_flush,
pb_malloc_bufmgr_is_buffer_busy
};
struct pb_manager *
pb_malloc_bufmgr_create(void)
{
return &pb_malloc_bufmgr;
}

9
src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
View File

@@ -86,15 +86,6 @@ struct pb_manager
struct pb_buffer *buf );
};
/**
* Malloc buffer provider.
*
* Simple wrapper around pb_malloc_buffer_create for convenience.
*/
struct pb_manager *
pb_malloc_bufmgr_create(void);
/**
* Static sub-allocator based the old memory manager.
*