From: Nicolai Hähnle <nicolai.haeh...@amd.com> Cc: Jose Fonseca <jfons...@vmware.com> --- src/gallium/auxiliary/Makefile.sources | 1 - src/gallium/auxiliary/meson.build | 1 - src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c | 1 - src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c | 1 - src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c | 1 - src/gallium/auxiliary/pipebuffer/pb_cache.c | 2 +- src/gallium/auxiliary/util/u_time.h | 150 --------------------- src/gallium/drivers/svga/svga_pipe_draw.c | 1 - 8 files changed, 1 insertion(+), 157 deletions(-) delete mode 100644 src/gallium/auxiliary/util/u_time.h
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources index 4fb7a30613a..f40c4723fae 100644 --- a/src/gallium/auxiliary/Makefile.sources +++ b/src/gallium/auxiliary/Makefile.sources @@ -295,21 +295,20 @@ C_SOURCES := \ util/u_surface.c \ util/u_surface.h \ util/u_surfaces.c \ util/u_surfaces.h \ util/u_tests.c \ util/u_tests.h \ util/u_texture.c \ util/u_texture.h \ util/u_tile.c \ util/u_tile.h \ - util/u_time.h \ util/u_transfer.c \ util/u_transfer.h \ util/u_threaded_context.c \ util/u_threaded_context.h \ util/u_threaded_context_calls.h \ util/u_upload_mgr.c \ util/u_upload_mgr.h \ util/u_vbuf.c \ util/u_vbuf.h \ util/u_video.h \ diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index 2796fd51fc3..eddfa567cfc 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -317,21 +317,20 @@ files_libgallium = files( 'util/u_surface.c', 'util/u_surface.h', 'util/u_surfaces.c', 'util/u_surfaces.h', 'util/u_tests.c', 'util/u_tests.h', 'util/u_texture.c', 'util/u_texture.h', 'util/u_tile.c', 'util/u_tile.h', - 'util/u_time.h', 'util/u_transfer.c', 'util/u_transfer.h', 'util/u_threaded_context.c', 'util/u_threaded_context.h', 'util/u_threaded_context_calls.h', 'util/u_upload_mgr.c', 'util/u_upload_mgr.h', 'util/u_vbuf.c', 'util/u_vbuf.h', 'util/u_video.h', diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c index d22c24e6755..24831f60948 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c @@ -32,21 +32,20 @@ * \author Jose Fonseca <jfonseca-at-vmware-dot-com> * \author Thomas Hellström <thellstrom-at-vmware-dot-com> */ #include "pipe/p_compiler.h" #include "util/u_debug.h" #include "os/os_thread.h" #include "util/u_memory.h" #include "util/list.h" -#include "util/u_time.h" #include "pb_buffer.h" #include "pb_bufmgr.h" #include "pb_cache.h" /** * Wrapper around a pipe buffer which adds delayed destruction. */ struct pb_cache_buffer diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c index df233c39878..3c83de80375 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c @@ -32,21 +32,20 @@ * \author Jose Fonseca <jfons...@vmware.com> */ #include "pipe/p_compiler.h" #include "util/u_debug.h" #include "os/os_thread.h" #include "util/u_math.h" #include "util/u_memory.h" #include "util/list.h" -#include "util/u_time.h" #include "util/u_debug_stack.h" #include <inttypes.h> #include "pb_buffer.h" #include "pb_bufmgr.h" #ifdef DEBUG diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c index dbecf15903d..5cf707164ff 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c @@ -35,21 +35,20 @@ * @author Thomas Hellstrom <thellstrom-at-vmware-dot-com> * @author Jose Fonseca <jfons...@vmware.com> */ #include "pipe/p_compiler.h" #include "util/u_debug.h" #include "os/os_thread.h" #include "pipe/p_defines.h" #include "util/u_memory.h" #include "util/list.h" -#include "util/u_time.h" #include "pb_buffer.h" #include "pb_bufmgr.h" struct pb_slab; /** * Buffer in a slab. diff --git a/src/gallium/auxiliary/pipebuffer/pb_cache.c b/src/gallium/auxiliary/pipebuffer/pb_cache.c index 9b75ff0c1ac..b67e54b6b52 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_cache.c +++ b/src/gallium/auxiliary/pipebuffer/pb_cache.c @@ -21,21 +21,21 @@ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. * IN NO EVENT SHALL AUTHORS 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. * **************************************************************************/ #include "pb_cache.h" #include "util/u_memory.h" -#include "util/u_time.h" +#include "util/os_time.h" /** * Actually destroy the buffer. */ static void destroy_buffer_locked(struct pb_cache_entry *entry) { struct pb_cache *mgr = entry->mgr; struct pb_buffer *buf = entry->buffer; diff --git a/src/gallium/auxiliary/util/u_time.h b/src/gallium/auxiliary/util/u_time.h deleted file mode 100644 index 99fa1400511..00000000000 --- a/src/gallium/auxiliary/util/u_time.h +++ /dev/null @@ -1,150 +0,0 @@ -/************************************************************************** - * - * Copyright 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 - * OS independent time-manipulation functions. - * - * @author Jose Fonseca <jfons...@vmware.com> - */ - -#ifndef U_TIME_H_ -#define U_TIME_H_ - - -#include "pipe/p_config.h" - -#include "util/os_time.h" - -#include "pipe/p_compiler.h" - - -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * Time abstraction. - * - * Do not access this structure directly. Use the provided function instead. - */ -struct util_time -{ - int64_t counter; -}; - - -PIPE_DEPRECATED -static inline void -util_time_get(struct util_time *t) -{ - t->counter = os_time_get(); -} - - -/** - * Return t2 = t1 + usecs - */ -PIPE_DEPRECATED -static inline void -util_time_add(const struct util_time *t1, - int64_t usecs, - struct util_time *t2) -{ - t2->counter = t1->counter + usecs; -} - - -/** - * Return difference between times, in microseconds - */ -PIPE_DEPRECATED -static inline int64_t -util_time_diff(const struct util_time *t1, - const struct util_time *t2) -{ - return t2->counter - t1->counter; -} - - -/** - * Compare two time values. - * - * Not publicly available because it does not take in account wrap-arounds. - * Use util_time_timeout instead. - */ -static inline int -_util_time_compare(const struct util_time *t1, - const struct util_time *t2) -{ - if (t1->counter < t2->counter) - return -1; - else if(t1->counter > t2->counter) - return 1; - else - return 0; -} - - -/** - * Returns non-zero when the timeout expires. - */ -PIPE_DEPRECATED -static inline boolean -util_time_timeout(const struct util_time *start, - const struct util_time *end, - const struct util_time *curr) -{ - return os_time_timeout(start->counter, end->counter, curr->counter); -} - - -/** - * Return current time in microseconds - */ -PIPE_DEPRECATED -static inline int64_t -util_time_micros(void) -{ - return os_time_get(); -} - - -PIPE_DEPRECATED -static inline void -util_time_sleep(int64_t usecs) -{ - os_time_sleep(usecs); -} - - -#ifdef __cplusplus -} -#endif - -#endif /* U_TIME_H_ */ diff --git a/src/gallium/drivers/svga/svga_pipe_draw.c b/src/gallium/drivers/svga/svga_pipe_draw.c index fea9da1d339..5fa562b08e6 100644 --- a/src/gallium/drivers/svga/svga_pipe_draw.c +++ b/src/gallium/drivers/svga/svga_pipe_draw.c @@ -22,21 +22,20 @@ * SOFTWARE. * **********************************************************/ #include "util/u_format.h" #include "util/u_helpers.h" #include "util/u_inlines.h" #include "util/u_prim.h" #include "util/u_prim_restart.h" -#include "util/u_time.h" #include "util/u_upload_mgr.h" #include "indices/u_indices.h" #include "svga_hw_reg.h" #include "svga_cmd.h" #include "svga_context.h" #include "svga_screen.h" #include "svga_draw.h" #include "svga_shader.h" #include "svga_state.h" -- 2.11.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev