Today, the EGLSurface belonging to struct wegl_window (and, post-patch,
struct wegl_surface) is always created with eglCreateWindowSurface. But
future patches will extend it to allow the EGLSurface to be a pbuffer.
Hence the rename, to reduce confusion.
This patch renames the files. The next patch renames the symbols.
---
Android.mk | 2 +-
src/waffle/CMakeLists.txt | 2 +-
src/waffle/android/droid_window.h | 2 +-
src/waffle/egl/{wegl_window.c => wegl_surface.c} | 2 +-
src/waffle/egl/{wegl_window.h => wegl_surface.h} | 0
src/waffle/egl/wegl_util.c | 2 +-
src/waffle/gbm/wgbm_window.h | 2 +-
src/waffle/wayland/wayland_window.h | 2 +-
src/waffle/xegl/xegl_window.h | 2 +-
9 files changed, 8 insertions(+), 8 deletions(-)
rename src/waffle/egl/{wegl_window.c => wegl_surface.c} (99%)
rename src/waffle/egl/{wegl_window.h => wegl_surface.h} (100%)
diff --git a/Android.mk b/Android.mk
index abfe4ff..d3fda69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -82,7 +82,7 @@ LOCAL_SRC_FILES := \
src/waffle/egl/wegl_display.c \
src/waffle/egl/wegl_platform.c \
src/waffle/egl/wegl_util.c \
- src/waffle/egl/wegl_window.c \
+ src/waffle/egl/wegl_surface.c \
src/waffle/android/droid_platform.c \
src/waffle/android/droid_display.c \
src/waffle/android/droid_window.c \
diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
index dd9fa11..9150f7d 100644
--- a/src/waffle/CMakeLists.txt
+++ b/src/waffle/CMakeLists.txt
@@ -102,7 +102,7 @@ if(waffle_has_egl)
egl/wegl_display.c
egl/wegl_platform.c
egl/wegl_util.c
- egl/wegl_window.c
+ egl/wegl_surface.c
)
endif()
diff --git a/src/waffle/android/droid_window.h
b/src/waffle/android/droid_window.h
index deaec01..4067c98 100644
--- a/src/waffle/android/droid_window.h
+++ b/src/waffle/android/droid_window.h
@@ -27,7 +27,7 @@
#include <stdbool.h>
-#include "wegl_window.h"
+#include "wegl_surface.h"
struct wcore_platform;
diff --git a/src/waffle/egl/wegl_window.c b/src/waffle/egl/wegl_surface.c
similarity index 99%
rename from src/waffle/egl/wegl_window.c
rename to src/waffle/egl/wegl_surface.c
index 753fd2f..961c0bb 100644
--- a/src/waffle/egl/wegl_window.c
+++ b/src/waffle/egl/wegl_surface.c
@@ -28,7 +28,7 @@
#include "wegl_imports.h"
#include "wegl_platform.h"
#include "wegl_util.h"
-#include "wegl_window.h"
+#include "wegl_surface.h"
/// On Linux, according to eglplatform.h, EGLNativeDisplayType and intptr_t
/// have the same size regardless of platform.
diff --git a/src/waffle/egl/wegl_window.h b/src/waffle/egl/wegl_surface.h
similarity index 100%
rename from src/waffle/egl/wegl_window.h
rename to src/waffle/egl/wegl_surface.h
diff --git a/src/waffle/egl/wegl_util.c b/src/waffle/egl/wegl_util.c
index 81fdbd9..6b4f90e 100644
--- a/src/waffle/egl/wegl_util.c
+++ b/src/waffle/egl/wegl_util.c
@@ -30,7 +30,7 @@
#include "wegl_imports.h"
#include "wegl_platform.h"
#include "wegl_util.h"
-#include "wegl_window.h"
+#include "wegl_surface.h"
void
wegl_emit_error(struct wegl_platform *plat, const char *egl_func_call)
diff --git a/src/waffle/gbm/wgbm_window.h b/src/waffle/gbm/wgbm_window.h
index 7827823..ed444b9 100644
--- a/src/waffle/gbm/wgbm_window.h
+++ b/src/waffle/gbm/wgbm_window.h
@@ -27,7 +27,7 @@
#include <stdbool.h>
-#include "wegl_window.h"
+#include "wegl_surface.h"
struct wcore_platform;
struct gbm_surface;
diff --git a/src/waffle/wayland/wayland_window.h
b/src/waffle/wayland/wayland_window.h
index 11e6791..1893623 100644
--- a/src/waffle/wayland/wayland_window.h
+++ b/src/waffle/wayland/wayland_window.h
@@ -32,7 +32,7 @@
#include "wcore_window.h"
#include "wcore_util.h"
-#include "wegl_window.h"
+#include "wegl_surface.h"
struct wcore_platform;
diff --git a/src/waffle/xegl/xegl_window.h b/src/waffle/xegl/xegl_window.h
index e59c02f..d994897 100644
--- a/src/waffle/xegl/xegl_window.h
+++ b/src/waffle/xegl/xegl_window.h
@@ -32,7 +32,7 @@
#include "x11_window.h"
-#include "wegl_window.h"
+#include "wegl_surface.h"
struct wcore_platform;
--
2.10.0
_______________________________________________
waffle mailing list
waffle@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/waffle
