Skip to content

S
swiftshader
Commit 2f48bcb9 by Alexis Hetu Committed by Alexis Hétu
Options

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/8254Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent a2ee435b
Showing with 21 additions and 19 deletions
src/OpenGL/libEGL/Android.mk
...@@ -18,7 +18,7 @@ endif ...@@ -18,7 +18,7 @@ endif
COMMON_SRC_FILES := \ COMMON_SRC_FILES := \
Config.cpp \ Config.cpp \
Display.cpp \ Display.cpp \
Surface.cpp \ EGLSurface.cpp \
libEGL.cpp \ libEGL.cpp \
main.cpp main.cpp
......
src/OpenGL/libEGL/BUILD.gn
...@@ -39,10 +39,12 @@ shared_library("swiftshader_libEGL") { ...@@ -39,10 +39,12 @@ shared_library("swiftshader_libEGL") {
} }
sources = [ sources = [
"../../Renderer/Surface.cpp",
"../common/Image.cpp",
"../common/Object.cpp", "../common/Object.cpp",
"Config.cpp", "Config.cpp",
"Display.cpp", "Display.cpp",
"Surface.cpp", "EGLSurface.cpp",
"libEGL.cpp", "libEGL.cpp",
"libEGL.def", "libEGL.def",
"libEGL.rc", "libEGL.rc",
......
src/OpenGL/libEGL/Display.cpp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "Display.h" #include "Display.h"
#include "main.h" #include "main.h"
#include "libEGL/Surface.h" #include "libEGL/EGLSurface.h"
#include "libEGL/Context.hpp" #include "libEGL/Context.hpp"
#include "common/Image.hpp" #include "common/Image.hpp"
#include "common/debug.h" #include "common/debug.h"
......
src/OpenGL/libEGL/Surface.cpp → src/OpenGL/libEGL/EGLSurface.cpp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
// such as the client area of a window, including any back buffers. // 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. // Implements EGLSurface and related functionality. [EGL 1.4] section 2.2 page 3.
#include "Surface.h" #include "EGLSurface.h"
#include "main.h" #include "main.h"
#include "Display.h" #include "Display.h"
......
src/OpenGL/libEGL/libEGL.cpp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "main.h" #include "main.h"
#include "Display.h" #include "Display.h"
#include "Surface.h" #include "EGLSurface.h"
#include "Texture.hpp" #include "Texture.hpp"
#include "Context.hpp" #include "Context.hpp"
#include "common/Image.hpp" #include "common/Image.hpp"
......
src/OpenGL/libEGL/libEGL.vcxproj
...@@ -313,7 +313,7 @@ copy "$(OutDir)libEGL.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\trans ...@@ -313,7 +313,7 @@ copy "$(OutDir)libEGL.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\trans
<ClCompile Include="Display.cpp" /> <ClCompile Include="Display.cpp" />
<ClCompile Include="libEGL.cpp" /> <ClCompile Include="libEGL.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="Surface.cpp" /> <ClCompile Include="EGLSurface.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\common\debug.h" /> <ClInclude Include="..\common\debug.h" />
...@@ -329,7 +329,7 @@ copy "$(OutDir)libEGL.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\trans ...@@ -329,7 +329,7 @@ copy "$(OutDir)libEGL.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\trans
<ClInclude Include="libEGL.hpp" /> <ClInclude Include="libEGL.hpp" />
<ClInclude Include="main.h" /> <ClInclude Include="main.h" />
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
<ClInclude Include="Surface.h" /> <ClInclude Include="EGLSurface.h" />
<ClInclude Include="Sync.hpp" /> <ClInclude Include="Sync.hpp" />
<ClInclude Include="Texture.hpp" /> <ClInclude Include="Texture.hpp" />
</ItemGroup> </ItemGroup>
......
src/OpenGL/libEGL/libEGL.vcxproj.filters
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Surface.cpp"> <ClCompile Include="..\common\Object.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\common\Object.cpp"> <ClCompile Include="EGLSurface.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
...@@ -46,9 +46,6 @@ ...@@ -46,9 +46,6 @@
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Surface.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\include\EGL\egl.h"> <ClInclude Include="..\include\EGL\egl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
...@@ -82,6 +79,9 @@ ...@@ -82,6 +79,9 @@
<ClInclude Include="..\common\NameSpace.hpp"> <ClInclude Include="..\common\NameSpace.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="EGLSurface.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="libEGL.rc" /> <ResourceCompile Include="libEGL.rc" />
......
src/OpenGL/libEGL/main.cpp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "libEGL.hpp" #include "libEGL.hpp"
#include "Context.hpp" #include "Context.hpp"
#include "Surface.h" #include "EGLSurface.h"
#include "resource.h" #include "resource.h"
#include "Common/Thread.hpp" #include "Common/Thread.hpp"
......
src/OpenGL/libGLES_CM/Context.cpp
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "VertexDataManager.h" #include "VertexDataManager.h"
#include "IndexDataManager.h" #include "IndexDataManager.h"
#include "libEGL/Display.h" #include "libEGL/Display.h"
#include "libEGL/Surface.h" #include "libEGL/EGLSurface.h"
#include "Common/Half.hpp" #include "Common/Half.hpp"
#include <EGL/eglext.h> #include <EGL/eglext.h>
......
src/OpenGL/libGLES_CM/Texture.cpp
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "Framebuffer.h" #include "Framebuffer.h"
#include "Device.hpp" #include "Device.hpp"
#include "libEGL/Display.h" #include "libEGL/Display.h"
#include "libEGL/Surface.h" #include "libEGL/EGLSurface.h"
#include "common/debug.h" #include "common/debug.h"
#include <algorithm> #include <algorithm>
......
src/OpenGL/libGLES_CM/main.cpp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "libGLES_CM.hpp" #include "libGLES_CM.hpp"
#include "Framebuffer.h" #include "Framebuffer.h"
#include "libEGL/Surface.h" #include "libEGL/EGLSurface.h"
#include "Common/Thread.hpp" #include "Common/Thread.hpp"
#include "Common/SharedLibrary.hpp" #include "Common/SharedLibrary.hpp"
#include "common/debug.h" #include "common/debug.h"
......
src/OpenGL/libGLESv2/Context.cpp
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "VertexDataManager.h" #include "VertexDataManager.h"
#include "IndexDataManager.h" #include "IndexDataManager.h"
#include "libEGL/Display.h" #include "libEGL/Display.h"
#include "libEGL/Surface.h" #include "libEGL/EGLSurface.h"
#include "Common/Half.hpp" #include "Common/Half.hpp"
#include <EGL/eglext.h> #include <EGL/eglext.h>
......
src/OpenGL/libGLESv2/Texture.cpp
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "Framebuffer.h" #include "Framebuffer.h"
#include "Device.hpp" #include "Device.hpp"
#include "libEGL/Display.h" #include "libEGL/Display.h"
#include "libEGL/Surface.h" #include "libEGL/EGLSurface.h"
#include "common/debug.h" #include "common/debug.h"
#include <algorithm> #include <algorithm>
......
src/OpenGL/libGLESv2/main.cpp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "libGLESv2.hpp" #include "libGLESv2.hpp"
#include "Framebuffer.h" #include "Framebuffer.h"
#include "libEGL/main.h" #include "libEGL/main.h"
#include "libEGL/Surface.h" #include "libEGL/EGLSurface.h"
#include "Common/Thread.hpp" #include "Common/Thread.hpp"
#include "Common/SharedLibrary.hpp" #include "Common/SharedLibrary.hpp"
#include "common/debug.h" #include "common/debug.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment