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/libGLES_CM/libGLES_CM.vcxproj

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
index ce35b8d..300cd43 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
@@ -318,6 +318,7 @@
     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

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

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

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

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

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

     <ClCompile Include="Device.cpp" />

     <ClCompile Include="Framebuffer.cpp" />

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

     <ClCompile Include="IndexDataManager.cpp" />

     <ClCompile Include="libGLES_CM.cpp" />

     <ClCompile Include="main.cpp" />

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

   <ItemGroup>

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

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

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

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

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

@@ -349,7 +350,6 @@
     <ClInclude Include="Context.h" />

     <ClInclude Include="Device.hpp" />

     <ClInclude Include="Framebuffer.h" />

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

     <ClInclude Include="IndexDataManager.h" />

     <ClInclude Include="libGLES_CM.hpp" />

     <ClInclude Include="main.h" />