Combine es2::Image and es1::Image into egl::Image.

Change-Id: Iadd4ce8ac36ad3458741f244423731fa00d7fd84
Reviewed-on: https://swiftshader-review.googlesource.com/2982
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>

src/OpenGL/libGLESv2/libGLESv2.vcxproj

diff --git a/src/OpenGL/libGLESv2/libGLESv2.vcxproj b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
index 53592e9..b007bb6 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.vcxproj
+++ b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
@@ -318,6 +318,7 @@
     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

+    <ClCompile Include="..\common\Image.cpp" />

     <ClCompile Include="..\common\NameSpace.cpp" />

     <ClCompile Include="..\common\Object.cpp" />

     <ClCompile Include="Buffer.cpp" />

@@ -326,7 +327,6 @@
     <ClCompile Include="Device.cpp" />

     <ClCompile Include="Fence.cpp" />

     <ClCompile Include="Framebuffer.cpp" />

-    <ClCompile Include="Image.cpp" />

     <ClCompile Include="IndexDataManager.cpp" />

     <ClCompile Include="libGLESv2.cpp" />

     <ClCompile Include="libGLESv3.cpp" />

@@ -344,6 +344,7 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\common\debug.h" />

+    <ClInclude Include="..\common\Image.hpp" />

     <ClInclude Include="..\common\NameSpace.hpp" />

     <ClInclude Include="..\common\Object.hpp" />

     <ClInclude Include="..\include\GLES2\gl2.h" />

@@ -354,7 +355,6 @@
     <ClInclude Include="Device.hpp" />

     <ClInclude Include="Fence.h" />

     <ClInclude Include="Framebuffer.h" />

-    <ClInclude Include="Image.hpp" />

     <ClInclude Include="IndexDataManager.h" />

     <ClInclude Include="libGLESv2.hpp" />

     <ClInclude Include="main.h" />