summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-06-15 19:34:51 +0800
committerChia-I Wu <olv@lunarg.com>2010-06-17 16:05:18 +0800
commit6f690caddcd9afbea6ed3e743b0c95c02c85e5ef (patch)
tree411245a6738c68cdf6a5eab3aad34d5712b8b3c2
parent8f3e48ee2c77db7aeaf5ffc904db6790dd5a3bf4 (diff)
egl: s/_EGL_PLATFORM/_EGL_OS/ and s/POSIX/UNIX/.
A platform means a native window system in EGL. Use OS that follows Gallium instead.
-rw-r--r--src/egl/main/Makefile2
-rw-r--r--src/egl/main/SConscript2
-rw-r--r--src/egl/main/egldriver.c24
-rw-r--r--src/egl/main/eglstring.h2
4 files changed, 15 insertions, 15 deletions
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 82fd855b1d..0af964d874 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -49,7 +49,7 @@ OBJECTS = $(SOURCES:.c=.o)
# use dl*() to load drivers
-LOCAL_CFLAGS = -D_EGL_PLATFORM_POSIX=1
+LOCAL_CFLAGS = -D_EGL_OS_UNIX=1
EGL_DEFAULT_DISPLAY = $(word 1, $(EGL_DISPLAYS))
diff --git a/src/egl/main/SConscript b/src/egl/main/SConscript
index f3fe9966b3..a331c9711e 100644
--- a/src/egl/main/SConscript
+++ b/src/egl/main/SConscript
@@ -11,7 +11,7 @@ if env['platform'] != 'winddk':
env.Append(CPPDEFINES = [
'_EGL_DEFAULT_DISPLAY=\\"gdi\\"',
'_EGL_DRIVER_SEARCH_DIR=\\"\\"',
- '_EGL_PLATFORM_WINDOWS',
+ '_EGL_OS_WINDOWS',
'KHRONOS_DLL_EXPORTS',
])
diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 631a8710ac..ce5f0f22f0 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -23,7 +23,7 @@
#include "eglsurface.h"
#include "eglimage.h"
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
#include <dlfcn.h>
#include <sys/types.h>
#include <dirent.h>
@@ -34,7 +34,7 @@
/**
* Wrappers for dlopen/dlclose()
*/
-#if defined(_EGL_PLATFORM_WINDOWS)
+#if defined(_EGL_OS_WINDOWS)
/* XXX Need to decide how to do dynamic name lookup on Windows */
@@ -64,7 +64,7 @@ library_suffix(void)
}
-#elif defined(_EGL_PLATFORM_POSIX)
+#elif defined(_EGL_OS_UNIX)
static const char *DefaultDriverNames[] = {
@@ -119,11 +119,11 @@ _eglOpenLibrary(const char *driverPath, lib_handle *handle)
_eglLog(_EGL_DEBUG, "dlopen(%s)", driverPath);
lib = open_library(driverPath);
-#if defined(_EGL_PLATFORM_WINDOWS)
+#if defined(_EGL_OS_WINDOWS)
/* XXX untested */
if (lib)
mainFunc = (_EGLMain_t) GetProcAddress(lib, "_eglMain");
-#elif defined(_EGL_PLATFORM_POSIX)
+#elif defined(_EGL_OS_UNIX)
if (lib) {
union {
_EGLMain_t func;
@@ -301,7 +301,7 @@ _eglLoaderFile(const char *dir, size_t len, void *loader_data)
static EGLBoolean
_eglLoaderPattern(const char *dir, size_t len, void *loader_data)
{
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
const char *prefix, *suffix;
size_t prefix_len, suffix_len;
DIR *dirp;
@@ -352,7 +352,7 @@ _eglLoaderPattern(const char *dir, size_t len, void *loader_data)
closedir(dirp);
return EGL_TRUE;
-#else /* _EGL_PLATFORM_POSIX */
+#else /* _EGL_OS_UNIX */
/* stop immediately */
return EGL_FALSE;
#endif
@@ -397,20 +397,20 @@ _eglGetSearchPath(void)
{
static const char *search_path;
-#if defined(_EGL_PLATFORM_POSIX) || defined(_EGL_PLATFORM_WINDOWS)
+#if defined(_EGL_OS_UNIX) || defined(_EGL_OS_WINDOWS)
if (!search_path) {
static char buffer[1024];
const char *p;
int ret;
p = getenv("EGL_DRIVERS_PATH");
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
if (p && (geteuid() != getuid() || getegid() != getgid())) {
_eglLog(_EGL_DEBUG,
"ignore EGL_DRIVERS_PATH for setuid/setgid binaries");
p = NULL;
}
-#endif /* _EGL_PLATFORM_POSIX */
+#endif /* _EGL_OS_UNIX */
if (p) {
ret = _eglsnprintf(buffer, sizeof(buffer),
@@ -441,7 +441,7 @@ _eglPreloadUserDriver(void)
char *env;
env = getenv("EGL_DRIVER");
-#if defined(_EGL_PLATFORM_POSIX)
+#if defined(_EGL_OS_UNIX)
if (env && strchr(env, '/')) {
search_path = "";
if ((geteuid() != getuid() || getegid() != getgid())) {
@@ -450,7 +450,7 @@ _eglPreloadUserDriver(void)
env = NULL;
}
}
-#endif /* _EGL_PLATFORM_POSIX */
+#endif /* _EGL_OS_UNIX */
if (!env)
return EGL_FALSE;
diff --git a/src/egl/main/eglstring.h b/src/egl/main/eglstring.h
index bebb758dd8..f1d559b24a 100644
--- a/src/egl/main/eglstring.h
+++ b/src/egl/main/eglstring.h
@@ -3,7 +3,7 @@
#include <string.h>
-#ifdef _EGL_PLATFORM_WINDOWS
+#ifdef _EGL_OS_WINDOWS
#define _eglstrcasecmp _stricmp
#define _eglsnprintf _snprintf
#else