Renamed libEGL/Surface.* to libEGL/EGLSurface.*

src/OpenGL/libEGL/Android.mk

@@ -18,7 +18,7 @@ endif
 COMMON_SRC_FILES := \
 	Config.cpp \
 	Display.cpp \
-	Surface.cpp \
+	EGLSurface.cpp \
 	libEGL.cpp \
 	main.cpp
 

src/OpenGL/libEGL/BUILD.gn

@@ -39,10 +39,12 @@ shared_library("swiftshader_libEGL") {
   }
 
   sources = [
+    "../../Renderer/Surface.cpp",
+    "../common/Image.cpp",
     "../common/Object.cpp",
     "Config.cpp",
     "Display.cpp",
-    "Surface.cpp",
+    "EGLSurface.cpp",
     "libEGL.cpp",
     "libEGL.def",
     "libEGL.rc",

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"

src/OpenGL/libEGL/Surface.cpp → 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"

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"

src/OpenGL/libEGL/libEGL.vcxproj

@@ -313,7 +313,7 @@ copy "$(OutDir)libEGL.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\trans
     <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 @@ copy "$(OutDir)libEGL.dll" "$(SolutionDir)lib\$(Configuration)_$(Platform)\trans
     <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>

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" />

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"

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>

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>

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"

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>

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>

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"