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>

diff --git a/scons/gallium.py b/scons/gallium.py
index 5834f6e2194ef4013654b9ccef1074b82cacda20..6f5fca00acfcaf500c3377e2f314f73cfd27e2df 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -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

diff --git a/src/gallium/auxiliary/translate/translate_sse.c b/src/gallium/auxiliary/translate/translate_sse.c
index 298192f2875d56631af8fdcf8c8124b637116de5..35d29f6db4070593709768f681bcba4dffe5b6fb 100644 (file)
--- a/src/gallium/auxiliary/translate/translate_sse.c
+++ b/src/gallium/auxiliary/translate/translate_sse.c
@@ -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"

diff --git a/src/gallium/drivers/llvmpipe/lp_context.c b/src/gallium/drivers/llvmpipe/lp_context.c
index d310d2a9b0a2e41e56cc0bf7c64a156b15b99438..016416e01163c7f5ed5202a4a0328936456ec39c 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_context.c
+++ b/src/gallium/drivers/llvmpipe/lp_context.c
@@ -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
 

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 4bbedf9215e1e41053464c2c5e46c56067b95e13..d03c04504332e81b75940cfa0023816e4e5cac52 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -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);

diff --git a/src/util/os_memory.h b/src/util/os_memory.h
index 46a6b6e4572c4908b14cfa7588a6d87a9ec7fcca..7a40ba9e6089b5b9b5695162498bf4a71e81d750 100644 (file)
--- a/src/util/os_memory.h
+++ b/src/util/os_memory.h
@@ -39,7 +39,7 @@
 #include "pipe/p_compiler.h"
 
 
-#if defined(PIPE_SUBSYSTEM_EMBEDDED)
+#if defined(EMBEDDED_DEVICE)
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/util/os_misc.c b/src/util/os_misc.c
index e9a727c54d68cc61c0bd28f6dac6b35224ff83e7..3a1e7eaddabfbfd81997b8198c6acd2f270e6e66 100644 (file)
--- a/src/util/os_misc.c
+++ b/src/util/os_misc.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 */
 
 
 /**

diff --git a/src/util/u_debug.c b/src/util/u_debug.c
index 421ae95227bac40eb8a5f51104051dc6f620d02f..b27bf7c5480ff4bd47cd11bb5c9f75ffcd9780a9 100644 (file)
--- a/src/util/u_debug.c
+++ b/src/util/u_debug.c
@@ -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);