Renamed libEGL/Surface.* to libEGL/EGLSurface.*
In order to build libEGL without explicitly setting a dependency
on the Renderer and Reactor projects, the Renderer's Surface class
must be linked with libEGL. That was causing an issue where the 2
Surface.so objects were colliding on Linux. In order to solve the
issue, libEGL/Surface.* was renamed to libEGL/EGLSurface.*
Change-Id: I2e230dd770be56fd29f7aecd5133183a7d2f20b5
Reviewed-on: https://swiftshader-review.googlesource.com/8254
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index d1a8b5b..6db92e6 100644
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -18,7 +18,7 @@
COMMON_SRC_FILES := \
Config.cpp \
Display.cpp \
- Surface.cpp \
+ EGLSurface.cpp \
libEGL.cpp \
main.cpp
diff --git a/src/OpenGL/libEGL/BUILD.gn b/src/OpenGL/libEGL/BUILD.gn
index 3adafd2..84025bd 100644
--- a/src/OpenGL/libEGL/BUILD.gn
+++ b/src/OpenGL/libEGL/BUILD.gn
@@ -39,10 +39,12 @@
}
sources = [
+ "../../Renderer/Surface.cpp",
+ "../common/Image.cpp",
"../common/Object.cpp",
"Config.cpp",
"Display.cpp",
- "Surface.cpp",
+ "EGLSurface.cpp",
"libEGL.cpp",
"libEGL.def",
"libEGL.rc",
diff --git a/src/OpenGL/libEGL/Display.cpp b/src/OpenGL/libEGL/Display.cpp
index 6917916..67f6c65 100644
--- a/src/OpenGL/libEGL/Display.cpp
+++ b/src/OpenGL/libEGL/Display.cpp
@@ -19,7 +19,7 @@
#include "Display.h"
#include "main.h"
-#include "libEGL/Surface.h"
+#include "libEGL/EGLSurface.h"
#include "libEGL/Context.hpp"
#include "common/Image.hpp"
#include "common/debug.h"
diff --git a/src/OpenGL/libEGL/Surface.cpp b/src/OpenGL/libEGL/EGLSurface.cpp
similarity index 99%
rename from src/OpenGL/libEGL/Surface.cpp
rename to src/OpenGL/libEGL/EGLSurface.cpp
index b1e573b..f47cacb 100644
--- a/src/OpenGL/libEGL/Surface.cpp
+++ b/src/OpenGL/libEGL/EGLSurface.cpp
@@ -16,7 +16,7 @@
// such as the client area of a window, including any back buffers.
// Implements EGLSurface and related functionality. [EGL 1.4] section 2.2 page 3.
-#include "Surface.h"
+#include "EGLSurface.h"
#include "main.h"
#include "Display.h"
diff --git a/src/OpenGL/libEGL/Surface.h b/src/OpenGL/libEGL/EGLSurface.h
similarity index 100%
rename from src/OpenGL/libEGL/Surface.h
rename to src/OpenGL/libEGL/EGLSurface.h
diff --git a/src/OpenGL/libEGL/libEGL.cpp b/src/OpenGL/libEGL/libEGL.cpp
index 9174558..4a1998f 100644
--- a/src/OpenGL/libEGL/libEGL.cpp
+++ b/src/OpenGL/libEGL/libEGL.cpp
@@ -16,7 +16,7 @@
#include "main.h"
#include "Display.h"
-#include "Surface.h"
+#include "EGLSurface.h"
#include "Texture.hpp"
#include "Context.hpp"
#include "common/Image.hpp"
diff --git a/src/OpenGL/libEGL/libEGL.vcxproj b/src/OpenGL/libEGL/libEGL.vcxproj
index 1d262ea..bd5303a 100644
--- a/src/OpenGL/libEGL/libEGL.vcxproj
+++ b/src/OpenGL/libEGL/libEGL.vcxproj
@@ -313,7 +313,7 @@
<ClCompile Include="Display.cpp" />
<ClCompile Include="libEGL.cpp" />
<ClCompile Include="main.cpp" />
- <ClCompile Include="Surface.cpp" />
+ <ClCompile Include="EGLSurface.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\common\debug.h" />
@@ -329,7 +329,7 @@
<ClInclude Include="libEGL.hpp" />
<ClInclude Include="main.h" />
<ClInclude Include="resource.h" />
- <ClInclude Include="Surface.h" />
+ <ClInclude Include="EGLSurface.h" />
<ClInclude Include="Sync.hpp" />
<ClInclude Include="Texture.hpp" />
</ItemGroup>
diff --git a/src/OpenGL/libEGL/libEGL.vcxproj.filters b/src/OpenGL/libEGL/libEGL.vcxproj.filters
index 3848f41..6c99d0b 100644
--- a/src/OpenGL/libEGL/libEGL.vcxproj.filters
+++ b/src/OpenGL/libEGL/libEGL.vcxproj.filters
@@ -26,10 +26,10 @@
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="Surface.cpp">
+ <ClCompile Include="..\common\Object.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\common\Object.cpp">
+ <ClCompile Include="EGLSurface.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -46,9 +46,6 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="Surface.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="..\include\EGL\egl.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -82,6 +79,9 @@
<ClInclude Include="..\common\NameSpace.hpp">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="EGLSurface.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libEGL.rc" />
diff --git a/src/OpenGL/libEGL/main.cpp b/src/OpenGL/libEGL/main.cpp
index 539cad1..e6cf09a 100644
--- a/src/OpenGL/libEGL/main.cpp
+++ b/src/OpenGL/libEGL/main.cpp
@@ -18,7 +18,7 @@
#include "libEGL.hpp"
#include "Context.hpp"
-#include "Surface.h"
+#include "EGLSurface.h"
#include "resource.h"
#include "Common/Thread.hpp"
diff --git a/src/OpenGL/libGLES_CM/Context.cpp b/src/OpenGL/libGLES_CM/Context.cpp
index 307e6f0..5fca63e 100644
--- a/src/OpenGL/libGLES_CM/Context.cpp
+++ b/src/OpenGL/libGLES_CM/Context.cpp
@@ -28,7 +28,7 @@
#include "VertexDataManager.h"
#include "IndexDataManager.h"
#include "libEGL/Display.h"
-#include "libEGL/Surface.h"
+#include "libEGL/EGLSurface.h"
#include "Common/Half.hpp"
#include <EGL/eglext.h>
diff --git a/src/OpenGL/libGLES_CM/Texture.cpp b/src/OpenGL/libGLES_CM/Texture.cpp
index 4731635..2f99200 100644
--- a/src/OpenGL/libGLES_CM/Texture.cpp
+++ b/src/OpenGL/libGLES_CM/Texture.cpp
@@ -23,7 +23,7 @@
#include "Framebuffer.h"
#include "Device.hpp"
#include "libEGL/Display.h"
-#include "libEGL/Surface.h"
+#include "libEGL/EGLSurface.h"
#include "common/debug.h"
#include <algorithm>
diff --git a/src/OpenGL/libGLES_CM/main.cpp b/src/OpenGL/libGLES_CM/main.cpp
index 7cd2dfd..4840522 100644
--- a/src/OpenGL/libGLES_CM/main.cpp
+++ b/src/OpenGL/libGLES_CM/main.cpp
@@ -18,7 +18,7 @@
#include "libGLES_CM.hpp"
#include "Framebuffer.h"
-#include "libEGL/Surface.h"
+#include "libEGL/EGLSurface.h"
#include "Common/Thread.hpp"
#include "Common/SharedLibrary.hpp"
#include "common/debug.h"
diff --git a/src/OpenGL/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp
index 47feec6..2421359 100644
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -35,7 +35,7 @@
#include "VertexDataManager.h"
#include "IndexDataManager.h"
#include "libEGL/Display.h"
-#include "libEGL/Surface.h"
+#include "libEGL/EGLSurface.h"
#include "Common/Half.hpp"
#include <EGL/eglext.h>
diff --git a/src/OpenGL/libGLESv2/Texture.cpp b/src/OpenGL/libGLESv2/Texture.cpp
index deb8ed7..244041c 100644
--- a/src/OpenGL/libGLESv2/Texture.cpp
+++ b/src/OpenGL/libGLESv2/Texture.cpp
@@ -23,7 +23,7 @@
#include "Framebuffer.h"
#include "Device.hpp"
#include "libEGL/Display.h"
-#include "libEGL/Surface.h"
+#include "libEGL/EGLSurface.h"
#include "common/debug.h"
#include <algorithm>
diff --git a/src/OpenGL/libGLESv2/main.cpp b/src/OpenGL/libGLESv2/main.cpp
index 7537c15..9775eaf 100644
--- a/src/OpenGL/libGLESv2/main.cpp
+++ b/src/OpenGL/libGLESv2/main.cpp
@@ -19,7 +19,7 @@
#include "libGLESv2.hpp"
#include "Framebuffer.h"
#include "libEGL/main.h"
-#include "libEGL/Surface.h"
+#include "libEGL/EGLSurface.h"
#include "Common/Thread.hpp"
#include "Common/SharedLibrary.hpp"
#include "common/debug.h"
