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

scons: rename PIPE_SUBSYSTEM_EMBEDDED to EMBEDDED_DEVICE

Browse Source 
It has nothing to do with the PIPE_SUBSYSTEM_* stuff from gallium.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Eric Engestrom
2019-08-01 21:45:25 +01:00
parent 8c63348c94
commit e740e7a6f0
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scons/gallium.py
View File

@@ -406,7 +406,7 @@ def generate(env):
if platform == 'windows': if platform == 'windows':
cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_USER'] cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_USER']
if env['embedded']: if env['embedded']:
cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED'] cppdefines += ['EMBEDDED_DEVICE']
env.Append(CPPDEFINES = cppdefines) env.Append(CPPDEFINES = cppdefines)
# C compiler options # C compiler options

2
src/gallium/auxiliary/translate/translate_sse.c
View File

@@ -35,7 +35,7 @@
#include "translate.h" #include "translate.h"
#if (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)) && !defined(PIPE_SUBSYSTEM_EMBEDDED) #if (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)) && !defined(EMBEDDED_DEVICE)
#include "rtasm/rtasm_cpu.h" #include "rtasm/rtasm_cpu.h"
#include "rtasm/rtasm_x86sse.h" #include "rtasm/rtasm_x86sse.h"

2
src/gallium/drivers/llvmpipe/lp_context.c
View File

@@ -48,7 +48,7 @@
#include "lp_setup.h" #include "lp_setup.h"
/* This is only safe if there's just one concurrent context */ /* This is only safe if there's just one concurrent context */
#ifdef PIPE_SUBSYSTEM_EMBEDDED #ifdef EMBEDDED_DEVICE
#define USE_GLOBAL_LLVM_CONTEXT #define USE_GLOBAL_LLVM_CONTEXT
#endif #endif

2
src/gallium/drivers/llvmpipe/lp_screen.c
View File

@@ -703,7 +703,7 @@ llvmpipe_create_screen(struct sw_winsys *winsys)
llvmpipe_init_screen_resource_funcs(&screen->base); llvmpipe_init_screen_resource_funcs(&screen->base);
screen->num_threads = util_cpu_caps.nr_cpus > 1 ? util_cpu_caps.nr_cpus : 0; screen->num_threads = util_cpu_caps.nr_cpus > 1 ? util_cpu_caps.nr_cpus : 0;
#ifdef PIPE_SUBSYSTEM_EMBEDDED #ifdef EMBEDDED_DEVICE
screen->num_threads = 0; screen->num_threads = 0;
#endif #endif
screen->num_threads = debug_get_num_option("LP_NUM_THREADS", screen->num_threads); screen->num_threads = debug_get_num_option("LP_NUM_THREADS", screen->num_threads);

2
src/util/os_memory.h
View File

@@ -39,7 +39,7 @@
#include "pipe/p_compiler.h" #include "pipe/p_compiler.h"
#if defined(PIPE_SUBSYSTEM_EMBEDDED) #if defined(EMBEDDED_DEVICE)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
src/util/os_misc.c
View File

@@ -107,13 +107,13 @@ os_log_message(const char *message)
} }
#if !defined(PIPE_SUBSYSTEM_EMBEDDED) #if !defined(EMBEDDED_DEVICE)
const char * const char *
os_get_option(const char *name) os_get_option(const char *name)
{ {
return getenv(name); return getenv(name);
} }
#endif /* !PIPE_SUBSYSTEM_EMBEDDED */ #endif /* !EMBEDDED_DEVICE */
/** /**

2
src/util/u_debug.c
View File

@@ -51,7 +51,7 @@ void
_debug_vprintf(const char *format, va_list ap) _debug_vprintf(const char *format, va_list ap)
{ {
static char buf[4096] = {'\0'}; static char buf[4096] = {'\0'};
#if defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_EMBEDDED) #if defined(PIPE_OS_WINDOWS) || defined(EMBEDDED_DEVICE)
/* We buffer until we find a newline. */ /* We buffer until we find a newline. */
size_t len = strlen(buf); size_t len = strlen(buf);
int ret = vsnprintf(buf + len, sizeof(buf) - len, format, ap); int ret = vsnprintf(buf + len, sizeof(buf) - len, format, ap);