AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Replace u_simple_list.h with util/simple_list.h

Browse Source 
The code was exactly the same, except util/ has c++ guards and a struct
simple_node declaration.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Eric Anholt
2014-11-14 12:40:46 -08:00
parent 7c99187c6a
commit d70eb38517
25 changed files with 23 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/Makefile.sources
-1
View File
@@ -273,7 +273,6 @@ C_SOURCES := \
util/u_ringbuffer.h \
util/u_sampler.c \
util/u_sampler.h \
util/u_simple_list.h \
util/u_simple_shaders.c \
util/u_simple_shaders.h \
util/u_slab.c \
src/gallium/auxiliary/draw/draw_llvm.c
+1 -1
View File
@@ -54,7 +54,7 @@
#include "util/u_math.h"
#include "util/u_pointer.h"
#include "util/u_string.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#define DEBUG_STORE 0
src/gallium/auxiliary/draw/draw_llvm.h
+1 -1
View File
@@ -37,7 +37,7 @@
#include "gallivm/lp_bld_limits.h"
#include "pipe/p_context.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
struct draw_llvm;
src/gallium/auxiliary/gallivm/lp_bld_init.c
+1 -1
View File
@@ -31,7 +31,7 @@
#include "util/u_cpu_detect.h"
#include "util/u_debug.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "os/os_time.h"
#include "lp_bld.h"
#include "lp_bld_debug.h"
src/gallium/auxiliary/util/u_cache.c
+1 -1
View File
@@ -42,7 +42,7 @@
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_cache.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
struct util_cache_entry
src/gallium/auxiliary/util/u_simple_list.h
-199
View File
@@ -1,199 +0,0 @@
/**
* \file simple_list.h
* Simple macros for type-safe, intrusive lists.
*
* Intended to work with a list sentinal which is created as an empty
* list. Insert & delete are O(1).
*
* \author
* (C) 1997, Keith Whitwell
*/
/*
* Mesa 3-D graphics library
*
* Copyright (C) 1999-2001 Brian Paul 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, sublicense,
* 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 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 NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS 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.
*/
#ifndef _U_SIMPLE_LIST_H_
#define _U_SIMPLE_LIST_H_
/**
* Remove an element from list.
*
* \param elem element to remove.
*/
#define remove_from_list(elem) \
do { \
(elem)->next->prev = (elem)->prev; \
(elem)->prev->next = (elem)->next; \
(elem)->next = elem; \
(elem)->prev = elem; \
} while (0)
/**
* Insert an element to the list head.
*
* \param list list.
* \param elem element to insert.
*/
#define insert_at_head(list, elem) \
do { \
(elem)->prev = list; \
(elem)->next = (list)->next; \
(list)->next->prev = elem; \
(list)->next = elem; \
} while(0)
/**
* Insert an element to the list tail.
*
* \param list list.
* \param elem element to insert.
*/
#define insert_at_tail(list, elem) \
do { \
(elem)->next = list; \
(elem)->prev = (list)->prev; \
(list)->prev->next = elem; \
(list)->prev = elem; \
} while(0)
/**
* Move an element to the list head.
*
* \param list list.
* \param elem element to move.
*/
#define move_to_head(list, elem) \
do { \
remove_from_list(elem); \
insert_at_head(list, elem); \
} while (0)
/**
* Move an element to the list tail.
*
* \param list list.
* \param elem element to move.
*/
#define move_to_tail(list, elem) \
do { \
remove_from_list(elem); \
insert_at_tail(list, elem); \
} while (0)
/**
* Make a empty list empty.
*
* \param sentinal list (sentinal element).
*/
#define make_empty_list(sentinal) \
do { \
(sentinal)->next = sentinal; \
(sentinal)->prev = sentinal; \
} while (0)
/**
* Get list first element.
*
* \param list list.
*
* \return pointer to first element.
*/
#define first_elem(list) ((list)->next)
/**
* Get list last element.
*
* \param list list.
*
* \return pointer to last element.
*/
#define last_elem(list) ((list)->prev)
/**
* Get next element.
*
* \param elem element.
*
* \return pointer to next element.
*/
#define next_elem(elem) ((elem)->next)
/**
* Get previous element.
*
* \param elem element.
*
* \return pointer to previous element.
*/
#define prev_elem(elem) ((elem)->prev)
/**
* Test whether element is at end of the list.
*
* \param list list.
* \param elem element.
*
* \return non-zero if element is at end of list, or zero otherwise.
*/
#define at_end(list, elem) ((elem) == (list))
/**
* Test if a list is empty.
*
* \param list list.
*
* \return non-zero if list empty, or zero otherwise.
*/
#define is_empty_list(list) ((list)->next == (list))
/**
* Walk through the elements of a list.
*
* \param ptr pointer to the current element.
* \param list list.
*
* \note It should be followed by a { } block or a single statement, as in a \c
* for loop.
*/
#define foreach(ptr, list) \
for( ptr=(list)->next ; ptr!=list ; ptr=(ptr)->next )
/**
* Walk through the elements of a list.
*
* Same as #foreach but lets you unlink the current value during a list
* traversal. Useful for freeing a list, element by element.
*
* \param ptr pointer to the current element.
* \param t temporary pointer.
* \param list list.
*
* \note It should be followed by a { } block or a single statement, as in a \c
* for loop.
*/
#define foreach_s(ptr, t, list) \
for(ptr=(list)->next,t=(ptr)->next; list != ptr; ptr=t, t=(t)->next)
#endif /* _U_SIMPLE_LIST_H_ */
src/gallium/auxiliary/util/u_slab.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include <stdio.h>
src/gallium/drivers/llvmpipe/lp_context.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include "util/u_inlines.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "lp_clear.h"
#include "lp_context.h"
#include "lp_flush.h"
src/gallium/drivers/llvmpipe/lp_scene.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/u_format.h"
#include "lp_scene.h"
#include "lp_fence.h"
src/gallium/drivers/llvmpipe/lp_state_fs.c
+1 -1
View File
@@ -65,7 +65,7 @@
#include "util/u_format.h"
#include "util/u_dump.h"
#include "util/u_string.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/u_dual_blend.h"
#include "os/os_time.h"
#include "pipe/p_shader_tokens.h"
src/gallium/drivers/llvmpipe/lp_state_setup.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "os/os_time.h"
#include "gallivm/lp_bld_arit.h"
#include "gallivm/lp_bld_bitarit.h"
src/gallium/drivers/llvmpipe/lp_texture.c
+1 -1
View File
@@ -40,7 +40,7 @@
#include "util/u_format.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/u_transfer.h"
#include "lp_context.h"
src/gallium/drivers/r300/r300_context.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "util/u_memory.h"
#include "util/u_sampler.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/u_upload_mgr.h"
#include "os/os_time.h"
#include "vl/vl_decoder.h"
src/gallium/drivers/r300/r300_flush.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "draw/draw_context.h"
#include "draw/draw_private.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/u_upload_mgr.h"
#include "os/os_time.h"
src/gallium/drivers/r300/r300_query.c
+1 -1
View File
@@ -21,7 +21,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "r300_context.h"
#include "r300_screen.h"
src/gallium/drivers/rbug/rbug_context.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include "pipe/p_context.h"
#include "util/u_memory.h"
#include "util/u_inlines.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "rbug/rbug_context.h"
src/gallium/drivers/rbug/rbug_core.c
+1 -1
View File
@@ -31,7 +31,7 @@
#include "util/u_string.h"
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/u_network.h"
#include "os/os_time.h"
src/gallium/drivers/rbug/rbug_objects.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "tgsi/tgsi_parse.h"
src/gallium/drivers/rbug/rbug_screen.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include "pipe/p_state.h"
#include "util/u_memory.h"
#include "util/u_debug.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "rbug_public.h"
#include "rbug_screen.h"
src/gallium/drivers/trace/tr_context.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "pipe/p_format.h"
#include "pipe/p_screen.h"
src/gallium/drivers/trace/tr_screen.c
+1 -1
View File
@@ -27,7 +27,7 @@
#include "util/u_format.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "tr_dump.h"
#include "tr_dump_defines.h"
src/gallium/drivers/trace/tr_texture.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "util/u_inlines.h"
#include "util/u_hash_table.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "tr_screen.h"
#include "tr_context.h"
src/gallium/drivers/vc4/vc4_qir.c
+1 -1
View File
@@ -22,7 +22,7 @@
*/
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/ralloc.h"
#include "vc4_qir.h"
src/gallium/drivers/vc4/vc4_qir.h
+1 -6
View File
@@ -31,7 +31,7 @@
#include <string.h>
#include "util/macros.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "tgsi/tgsi_parse.h"
enum qfile {
@@ -162,11 +162,6 @@ enum qop {
QOP_R4_UNPACK_D
};
struct simple_node {
struct simple_node *next;
struct simple_node *prev;
};
struct queued_qpu_inst {
struct simple_node link;
uint64_t inst;
src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include "util/u_hash_table.h"
#include "util/u_memory.h"
#include "util/u_simple_list.h"
#include "util/simple_list.h"
#include "util/u_double_list.h"
#include "os/os_thread.h"
#include "os/os_mman.h"