scons: rename PIPE_SUBSYSTEM_EMBEDDED to EMBEDDED_DEVICE
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:
@@ -406,7 +406,7 @@ def generate(env):
|
||||
if platform == 'windows':
|
||||
cppdefines += ['PIPE_SUBSYSTEM_WINDOWS_USER']
|
||||
if env['embedded']:
|
||||
cppdefines += ['PIPE_SUBSYSTEM_EMBEDDED']
|
||||
cppdefines += ['EMBEDDED_DEVICE']
|
||||
env.Append(CPPDEFINES = cppdefines)
|
||||
|
||||
# C compiler options
|
||||
|
@@ -35,7 +35,7 @@
|
||||
#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_x86sse.h"
|
||||
|
@@ -48,7 +48,7 @@
|
||||
#include "lp_setup.h"
|
||||
|
||||
/* This is only safe if there's just one concurrent context */
|
||||
#ifdef PIPE_SUBSYSTEM_EMBEDDED
|
||||
#ifdef EMBEDDED_DEVICE
|
||||
#define USE_GLOBAL_LLVM_CONTEXT
|
||||
#endif
|
||||
|
||||
|
@@ -703,7 +703,7 @@ llvmpipe_create_screen(struct sw_winsys *winsys)
|
||||
llvmpipe_init_screen_resource_funcs(&screen->base);
|
||||
|
||||
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;
|
||||
#endif
|
||||
screen->num_threads = debug_get_num_option("LP_NUM_THREADS", screen->num_threads);
|
||||
|
@@ -39,7 +39,7 @@
|
||||
#include "pipe/p_compiler.h"
|
||||
|
||||
|
||||
#if defined(PIPE_SUBSYSTEM_EMBEDDED)
|
||||
#if defined(EMBEDDED_DEVICE)
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@@ -107,13 +107,13 @@ os_log_message(const char *message)
|
||||
}
|
||||
|
||||
|
||||
#if !defined(PIPE_SUBSYSTEM_EMBEDDED)
|
||||
#if !defined(EMBEDDED_DEVICE)
|
||||
const char *
|
||||
os_get_option(const char *name)
|
||||
{
|
||||
return getenv(name);
|
||||
}
|
||||
#endif /* !PIPE_SUBSYSTEM_EMBEDDED */
|
||||
#endif /* !EMBEDDED_DEVICE */
|
||||
|
||||
|
||||
/**
|
||||
|
@@ -51,7 +51,7 @@ void
|
||||
_debug_vprintf(const char *format, va_list ap)
|
||||
{
|
||||
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. */
|
||||
size_t len = strlen(buf);
|
||||
int ret = vsnprintf(buf + len, sizeof(buf) - len, format, ap);
|
||||
|
Reference in New Issue
Block a user