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

gallium: remove unused and deprecated u_time.h

Browse Source 
Cc: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle
2017-10-22 17:38:44 +02:00
parent 222a2fb998
commit c50743f61c
8 changed files with 1 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,7 +302,6 @@ C_SOURCES := \
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 \

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

@@ -322,7 +322,6 @@ files_libgallium = files(
'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',

1
src/gallium/auxiliary/pipebuffer/pb_bufmgr_cache.c
View File

@@ -39,7 +39,6 @@
#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"

1
src/gallium/auxiliary/pipebuffer/pb_bufmgr_debug.c
View File

@@ -39,7 +39,6 @@
#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>

1
src/gallium/auxiliary/pipebuffer/pb_bufmgr_slab.c
View File

@@ -42,7 +42,6 @@
#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"

2
src/gallium/auxiliary/pipebuffer/pb_cache.c
View File

@@ -28,7 +28,7 @@
#include "pb_cache.h"
#include "util/u_memory.h"
#include "util/u_time.h"
#include "util/os_time.h"
/**

150
src/gallium/auxiliary/util/u_time.h
View File

@@ -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 <jfonseca@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_ */

1
src/gallium/drivers/svga/svga_pipe_draw.c
View File

@@ -29,7 +29,6 @@
#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"