Fix build on Windows 8.1 SDK.

The Windows 8.1 SDK includes a new DLL compiler DLL, and is useful to test against, so we should fix the few deprecated functions and warnings. BUG=angle:649 Change-Id: I28bcf49564f3f7d7403d939d61dd78d3972281ba Reviewed-on: https://chromium-review.googlesource.com/199341Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Fix build on Windows 8.1 SDK.
fc2521e1 · Jamie Madill · 2d76e5f6 · fc2521e1 · fc2521e1 · fc2521e1
Commit fc2521e1 authored May 16, 2014 by Jamie Madill
10 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,7 @@ debug.txt
 *.orig
 *.rej
 .gclient_entries
-third_party
+/third_party
 tests/third_party
 out
 lib/*

--- a/projects/src/libGLESv2.vcxproj
+++ b/projects/src/libGLESv2.vcxproj
@@ -113,124 +113,104 @@
  <ItemGroup>
    <None Include="..\..\src\angle.gyp"/>
    <None Include="..\..\src\libGLESv2\libGLESv2.def"/>
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl"/>
    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat"/>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl"/>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl"/>
    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl"/>
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl"/>
    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough3D11.hlsl"/>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl"/>
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl"/>
    <None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.ps"/>
    <None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.vs"/>
    <None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\generate_shaders.bat"/>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\src\libGLESv2\resource.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Shader.h"/>
    <ClInclude Include="..\..\src\libGLESv2\BinaryStream.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\resource.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\queryconversions.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\validationES3.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\Program.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\main.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\Sampler.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h"/>
    <ClInclude Include="..\..\src\libGLESv2\precompiled.h"/>
    <ClInclude Include="..\..\src\libGLESv2\TransformFeedback.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Context.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Query.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\ResourceManager.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Texture.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\DynamicHLSL.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\VertexArray.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\Uniform.h"/>
    <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\constants.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Buffer.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\validationES.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\queryconversions.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\validationES3.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\Program.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\Sampler.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\ResourceManager.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\DynamicHLSL.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h"/>
    <ClInclude Include="..\..\src\libGLESv2\validationES2.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Fence.h"/>
    <ClInclude Include="..\..\src\libGLESv2\angletypes.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\Uniform.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\main.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\constants.h"/>
    <ClInclude Include="..\..\src\libGLESv2\Framebuffer.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\VertexArray.h"/>
    <ClInclude Include="..\..\src\libGLESv2\formatutils.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\validationES.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexDataManager.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\Renderer.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\TextureStorage.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\imageformats.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderExecutable.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexBuffer.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\loadimage.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\copyimage.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexRangeCache.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\FenceImpl.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\Image.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\generatemip.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\vertexconversion.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\RenderTarget.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\vertexconversion.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\VertexDataManager.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\VertexBuffer.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Query11.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Query11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2di11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_gs.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2dui11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2d11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3di11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2di11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei3dps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11vs.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3dui11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2darrayps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2dui11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha3d11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3di11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2dui11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3d11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_vs.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef3dps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4f.h"/>
@@ -238,49 +218,70 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2di11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3di11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2d11ps.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11vs.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3dui11ps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d\HLSLCompiler.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderCache.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h"/>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h"/>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\luminanceps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\passthroughps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\flipyvs.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\componentmaskps.h"/>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\standardvs.h"/>
-    <ClInclude Include="..\..\src\common\RefCountObject.h"/>
    <ClInclude Include="..\..\src\common\mathutil.h"/>
-    <ClInclude Include="..\..\src\common\event_tracer.h"/>
    <ClInclude Include="..\..\src\common\blocklayout.h"/>
    <ClInclude Include="..\..\src\common\debug.h"/>
    <ClInclude Include="..\..\src\common\shadervars.h"/>
-    <ClInclude Include="..\..\src\common\version.h"/>
    <ClInclude Include="..\..\src\common\utilities.h"/>
    <ClInclude Include="..\..\src\common\angleutils.h"/>
+    <ClInclude Include="..\..\src\common\RefCountObject.h"/>
+    <ClInclude Include="..\..\src\common\event_tracer.h"/>
+    <ClInclude Include="..\..\src\common\version.h"/>
+    <ClInclude Include="..\..\src\third_party\systeminfo\SystemInfo.h"/>
    <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/>
    <ClInclude Include="..\..\include\KHR\khrplatform.h"/>
    <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"/>
-    <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
    <ClInclude Include="..\..\include\GLES2\gl2ext.h"/>
    <ClInclude Include="..\..\include\GLES2\gl2.h"/>
+    <ClInclude Include="..\..\include\GLES2\gl2platform.h"/>
    <ClInclude Include="..\..\include\GLES3\gl3ext.h"/>
    <ClInclude Include="..\..\include\GLES3\gl3.h"/>
    <ClInclude Include="..\..\include\GLES3\gl3platform.h"/>
@@ -289,86 +290,87 @@
    <ClInclude Include="..\..\include\EGL\eglplatform.h"/>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\validationES2.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\precompiled.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\DynamicHLSL.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\HandleAllocator.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\RenderbufferProxySet.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\Context.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Fence.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\validationES.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\Program.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Query.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\Context.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Buffer.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Shader.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Uniform.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\main.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\Texture.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\Program.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\Texture.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\copyimage.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\IndexBuffer.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\loadimage.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\VertexDataManager.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\IndexRangeCache.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\Renderer.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\TextureStorage.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Image11.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d\HLSLCompiler.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Image9.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp"/>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.cpp"/>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp"/>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.cpp"/>
    <ClCompile Include="..\..\src\common\event_tracer.cpp"/>
+    <ClCompile Include="..\..\src\common\blocklayout.cpp"/>
    <ClCompile Include="..\..\src\common\RefCountObject.cpp"/>
    <ClCompile Include="..\..\src\common\utilities.cpp"/>
-    <ClCompile Include="..\..\src\common\debug.cpp"/>
    <ClCompile Include="..\..\src\common\mathutil.cpp"/>
-    <ClCompile Include="..\..\src\common\blocklayout.cpp"/>
+    <ClCompile Include="..\..\src\common\debug.cpp"/>
+    <ClCompile Include="..\..\src\third_party\systeminfo\SystemInfo.cpp"/>
    <ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp"/>
  </ItemGroup>
  <ItemGroup>

--- a/projects/src/libGLESv2.vcxproj.filters
+++ b/projects/src/libGLESv2.vcxproj.filters
@@ -37,6 +37,9 @@
    <Filter Include="src\third_party">
      <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
    </Filter>
+    <Filter Include="src\third_party\systeminfo">
+      <UniqueIdentifier>{8E42519F-DD71-5875-38CA-0ED32E34DB55}</UniqueIdentifier>
+    </Filter>
    <Filter Include="src\third_party\murmurhash">
      <UniqueIdentifier>{FBF5769C-D63C-9100-0719-0B97CE76B013}</UniqueIdentifier>
    </Filter>
@@ -63,12 +66,6 @@
    <None Include="..\..\src\angle.gyp">
      <Filter>src</Filter>
    </None>
-    <ClInclude Include="..\..\src\libGLESv2\resource.h">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp">
-      <Filter>src\libGLESv2</Filter>
-    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\Shader.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
@@ -78,7 +75,7 @@
    <ClInclude Include="..\..\src\libGLESv2\BinaryStream.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h">
+    <ClInclude Include="..\..\src\libGLESv2\resource.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\precompiled.cpp">
@@ -87,39 +84,18 @@
    <ClCompile Include="..\..\src\libGLESv2\DynamicHLSL.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\queryconversions.h">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\validationES3.h">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\Renderbuffer.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\Program.h">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\main.h">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp">
-      <Filter>src\libGLESv2</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\Sampler.h">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\HandleAllocator.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h">
+    <ClCompile Include="..\..\src\libGLESv2\queryconversions.cpp">
      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
+    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\precompiled.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp">
-      <Filter>src\libGLESv2</Filter>
-    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\TransformFeedback.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
@@ -129,120 +105,147 @@
    <ClInclude Include="..\..\src\libGLESv2\Query.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\ResourceManager.h">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
-    <ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc">
-      <Filter>src\libGLESv2</Filter>
-    </ResourceCompile>
    <ClCompile Include="..\..\src\libGLESv2\RenderbufferProxySet.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\libGLESv2\Fence.cpp">
+      <Filter>src\libGLESv2</Filter>
+    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\Texture.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\Context.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\validationES.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\DynamicHLSL.h">
+    <ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp">
+      <Filter>src\libGLESv2</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\VertexArray.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\Fence.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\Uniform.h">
+      <Filter>src\libGLESv2</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\Program.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp">
+      <Filter>src\libGLESv2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\ProgramBinary.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp">
+    <None Include="..\..\src\libGLESv2\libGLESv2.def">
+      <Filter>src\libGLESv2</Filter>
+    </None>
+    <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\Buffer.h">
+    <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp">
+      <Filter>src\libGLESv2</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\constants.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\validationES2.h">
+    <ClInclude Include="..\..\src\libGLESv2\Buffer.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\Fence.h">
+    <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\validationES.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\Query.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\Renderbuffer.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\validationES.h">
+      <Filter>src\libGLESv2</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\libGLESv2.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\angletypes.h">
+    <ClInclude Include="..\..\src\libGLESv2\queryconversions.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\Uniform.h">
+    <ClInclude Include="..\..\src\libGLESv2\validationES3.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\Query.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\Program.h">
      <Filter>src\libGLESv2</Filter>
-    </ClCompile>
+    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\Buffer.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\Sampler.h">
      <Filter>src\libGLESv2</Filter>
-    </ClCompile>
+    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\Shader.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\HandleAllocator.h">
+      <Filter>src\libGLESv2</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\formatutils.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\Uniform.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\ResourceManager.h">
+      <Filter>src\libGLESv2</Filter>
+    </ClInclude>
+    <ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc">
+      <Filter>src\libGLESv2</Filter>
+    </ResourceCompile>
+    <ClCompile Include="..\..\src\libGLESv2\Context.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\constants.h">
+    <ClInclude Include="..\..\src\libGLESv2\DynamicHLSL.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\main.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\TransformFeedback.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\Framebuffer.h">
+    <ClInclude Include="..\..\src\libGLESv2\VertexAttribute.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\Float16ToFloat32.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\validationES2.h">
+      <Filter>src\libGLESv2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libGLESv2\Fence.h">
+      <Filter>src\libGLESv2</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\Buffer.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <None Include="..\..\src\libGLESv2\libGLESv2.def">
+    <ClInclude Include="..\..\src\libGLESv2\angletypes.h">
      <Filter>src\libGLESv2</Filter>
-    </None>
+    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\ResourceManager.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\Texture.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\Shader.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\validationES3.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\Uniform.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\VertexArray.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\main.cpp">
+      <Filter>src\libGLESv2</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\main.h">
+      <Filter>src\libGLESv2</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\ProgramBinary.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\Sampler.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\VertexArray.h">
+    <ClInclude Include="..\..\src\libGLESv2\Framebuffer.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\formatutils.h">
      <Filter>src\libGLESv2</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\Program.cpp">
-      <Filter>src\libGLESv2</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\angletypes.cpp">
-      <Filter>src\libGLESv2</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\Framebuffer.cpp">
      <Filter>src\libGLESv2</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\RenderbufferProxySet.h">
+    <ClCompile Include="..\..\src\libGLESv2\Texture.cpp">
-      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\validationES.h">
      <Filter>src\libGLESv2</Filter>
-    </ClInclude>
+    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexDataManager.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
@@ -252,49 +255,58 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\Renderer.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp">
-      <Filter>src\libGLESv2\renderer</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\renderer\IndexDataManager.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\TextureStorage.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\imageformats.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\TextureStorage.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\IndexBuffer.cpp">
+      <Filter>src\libGLESv2\renderer</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderExecutable.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexBuffer.h">
      <Filter>src\libGLESv2\renderer</Filter>
-    </ClCompile>
+    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\imageformats.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\loadimage.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\IndexBuffer.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\copyimage.h">
+      <Filter>src\libGLESv2\renderer</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\loadimage.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\VertexDataManager.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\ShaderExecutable.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\loadimageSSE2.cpp">
+      <Filter>src\libGLESv2\renderer</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\copyvertex.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\VertexBuffer.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexBuffer.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\SwapChain.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\loadimage.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\Image.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
-    </ClInclude>
+    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\copyimage.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\BufferStorage.cpp">
+      <Filter>src\libGLESv2\renderer</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\QueryImpl.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\IndexRangeCache.h">
@@ -303,33 +315,24 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\FenceImpl.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\loadimage.cpp">
-      <Filter>src\libGLESv2\renderer</Filter>
-    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\renderer\Image.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\generatemip.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\vertexconversion.h">
-      <Filter>src\libGLESv2\renderer</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\RenderTarget.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\VertexDataManager.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\vertexconversion.h">
      <Filter>src\libGLESv2\renderer</Filter>
-    </ClCompile>
+    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\VertexDataManager.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\IndexRangeCache.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\BufferStorage.h">
-      <Filter>src\libGLESv2\renderer</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\VertexBuffer.h">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClInclude>
@@ -339,30 +342,18 @@
    <ClCompile Include="..\..\src\libGLESv2\renderer\TextureStorage.cpp">
      <Filter>src\libGLESv2\renderer</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
@@ -372,24 +363,12 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Query11.cpp">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h">
-      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
@@ -399,37 +378,61 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Clear11.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
-    </ClCompile>
+    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Blit11.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Query11.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\TextureStorage11.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Image11.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Renderer11.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.h">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.cpp">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp">
+      <Filter>src\libGLESv2\renderer\d3d11</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\Query11.h">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\formatutils11.h">
@@ -441,28 +444,28 @@
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Image11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\Fence11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp">
      <Filter>src\libGLESv2\renderer\d3d11</Filter>
    </ClCompile>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat">
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl">
      <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
    </None>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl">
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\generate_shaders.bat">
      <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
    </None>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl">
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl">
      <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
    </None>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Swizzle11.hlsl">
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough2D11.hlsl">
      <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
    </None>
    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Passthrough3D11.hlsl">
      <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
    </None>
-    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\Clear11.hlsl">
+    <None Include="..\..\src\libGLESv2\renderer\d3d11\shaders\BufferToTexture11.hlsl">
      <Filter>src\libGLESv2\renderer\d3d11\shaders</Filter>
    </None>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2di11ps.h">
@@ -474,148 +477,148 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2dui11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough2d11vs.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3di11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2di11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei3dps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3di11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11vs.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3dui11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2darrayps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2di11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2dui11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei3dps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha3d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3di11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11vs.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2dui11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3dui11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_vs.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2darrayps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef3dps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4f.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2di11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3di11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2dui11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha3d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3di11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2dps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3di11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg2dui11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11gs.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11vs.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlei2darrayps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui2dps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearfloat11vs.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum3d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2di11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_vs.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlum2d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3dui11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2dps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr3d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef3dps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughdepth2d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4f.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4ui.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughr2d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2di11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzlef2darrayps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba3di11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb2d11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgba2dui11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\buffertotexture11_ps_4i.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearsint11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughlumalpha2d11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\clearuint11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11vs.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrg3dui11ps.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\swizzleui3dps.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthrough3d11vs.h">
      <Filter>src\libGLESv2\renderer\d3d11\shaders\compiled</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d11\shaders\compiled\passthroughrgb3dui11ps.h">
@@ -627,9 +630,6 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d\HLSLCompiler.h">
      <Filter>src\libGLESv2\renderer\d3d</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
-      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
@@ -639,85 +639,88 @@
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Image9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h">
-      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h">
-      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h">
-      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderCache.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp">
-      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClCompile>
+    </ClInclude>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClCompile>
+    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.cpp">
-      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClCompile>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
-    </ClInclude>
+    </ClCompile>
    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\SwapChain9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Renderer9.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
+      <Filter>src\libGLESv2\renderer\d3d9</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\renderer9_utils.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Blit9.cpp">
+      <Filter>src\libGLESv2\renderer\d3d9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.cpp">
+      <Filter>src\libGLESv2\renderer\d3d9</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Query9.h">
+      <Filter>src\libGLESv2\renderer\d3d9</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Fence9.h">
+      <Filter>src\libGLESv2\renderer\d3d9</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\TextureStorage9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\VertexBuffer9.h">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\IndexBuffer9.cpp">
+      <Filter>src\libGLESv2\renderer\d3d9</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\RenderTarget9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\Query9.cpp">
+    <ClCompile Include="..\..\src\libGLESv2\renderer\d3d9\formatutils9.cpp">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\Image9.h">
+    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\BufferStorage9.h">
      <Filter>src\libGLESv2\renderer\d3d9</Filter>
    </ClInclude>
    <None Include="..\..\src\libGLESv2\renderer\d3d9\shaders\Blit.ps">
@@ -744,72 +747,78 @@
    <ClInclude Include="..\..\src\libGLESv2\renderer\d3d9\shaders\compiled\standardvs.h">
      <Filter>src\libGLESv2\renderer\d3d9\shaders\compiled</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\RefCountObject.h">
-      <Filter>src\common</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\common\mathutil.h">
      <Filter>src\common</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\event_tracer.h">
-      <Filter>src\common</Filter>
-    </ClInclude>
    <ClCompile Include="..\..\src\common\event_tracer.cpp">
      <Filter>src\common</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\common\blocklayout.h">
      <Filter>src\common</Filter>
    </ClInclude>
-    <ClCompile Include="..\..\src\common\RefCountObject.cpp">
+    <ClInclude Include="..\..\src\common\debug.h">
      <Filter>src\common</Filter>
-    </ClCompile>
+    </ClInclude>
-    <ClCompile Include="..\..\src\common\utilities.cpp">
+    <ClInclude Include="..\..\src\common\shadervars.h">
      <Filter>src\common</Filter>
-    </ClCompile>
+    </ClInclude>
-    <ClCompile Include="..\..\src\common\debug.cpp">
+    <ClInclude Include="..\..\src\common\utilities.h">
      <Filter>src\common</Filter>
-    </ClCompile>
+    </ClInclude>
-    <ClCompile Include="..\..\src\common\mathutil.cpp">
+    <ClCompile Include="..\..\src\common\blocklayout.cpp">
      <Filter>src\common</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\common\debug.h">
+    <ClInclude Include="..\..\src\common\angleutils.h">
      <Filter>src\common</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\shadervars.h">
+    <ClInclude Include="..\..\src\common\RefCountObject.h">
      <Filter>src\common</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\version.h">
+    <ClInclude Include="..\..\src\common\event_tracer.h">
      <Filter>src\common</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\utilities.h">
+    <ClCompile Include="..\..\src\common\RefCountObject.cpp">
      <Filter>src\common</Filter>
-    </ClInclude>
+    </ClCompile>
-    <ClInclude Include="..\..\src\common\angleutils.h">
+    <ClCompile Include="..\..\src\common\utilities.cpp">
      <Filter>src\common</Filter>
-    </ClInclude>
+    </ClCompile>
-    <ClCompile Include="..\..\src\common\blocklayout.cpp">
+    <ClCompile Include="..\..\src\common\mathutil.cpp">
      <Filter>src\common</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp">
+    <ClCompile Include="..\..\src\common\debug.cpp">
-      <Filter>src\third_party\murmurhash</Filter>
+      <Filter>src\common</Filter>
+    </ClCompile>
+    <ClInclude Include="..\..\src\common\version.h">
+      <Filter>src\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\third_party\systeminfo\SystemInfo.h">
+      <Filter>src\third_party\systeminfo</Filter>
+    </ClInclude>
+    <ClCompile Include="..\..\src\third_party\systeminfo\SystemInfo.cpp">
+      <Filter>src\third_party\systeminfo</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h">
      <Filter>src\third_party\murmurhash</Filter>
    </ClInclude>
+    <ClCompile Include="..\..\src\third_party\murmurhash\MurmurHash3.cpp">
+      <Filter>src\third_party\murmurhash</Filter>
+    </ClCompile>
    <ClInclude Include="..\..\include\KHR\khrplatform.h">
      <Filter>include\KHR</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">
      <Filter>include\GLSLANG</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\GLES2\gl2platform.h">
-      <Filter>include\GLES2</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\include\GLES2\gl2ext.h">
      <Filter>include\GLES2</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\GLES2\gl2.h">
      <Filter>include\GLES2</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\GLES2\gl2platform.h">
+      <Filter>include\GLES2</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\include\GLES3\gl3ext.h">
      <Filter>include\GLES3</Filter>
    </ClInclude>

--- a/samples/angle/sample_util/win32/Win32Window.cpp
+++ b/samples/angle/sample_util/win32/Win32Window.cpp
@@ -453,6 +453,7 @@ void Win32Window::destroy()
    {
        eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
        eglTerminate(mDisplay);
+        mDisplay = EGL_NO_DISPLAY;
    }
    if (mNativeDisplay)

--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -36,7 +36,7 @@
                    'sources':
                    [
                        '<!@(python <(angle_path)/enumerate_files.py \
-                             -dirs common libGLESv2 third_party/murmurhash ../include \
+                             -dirs common libGLESv2 third_party/murmurhash ../include third_party/systeminfo \
                             -types *.cpp *.h *.hlsl *.vs *.ps *.bat *.def *.rc \
                             -excludes */d3d/* */d3d9/* */d3d11/*)',
                    ],

--- a/src/libGLESv2/renderer/Renderer.h
+++ b/src/libGLESv2/renderer/Renderer.h
@@ -19,19 +19,6 @@
 #define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL1
 #endif
-const int versionWindowsVista = MAKEWORD(0x00, 0x06);
-const int versionWindows7 = MAKEWORD(0x01, 0x06);
-// Return the version of the operating system in a format suitable for ordering
-// comparison.
-inline int getComparableOSVersion()
-{
-    DWORD version = GetVersion();
-    int majorVersion = LOBYTE(LOWORD(version));
-    int minorVersion = HIBYTE(LOWORD(version));
-    return MAKEWORD(minorVersion, majorVersion);
-}
 namespace egl
 {
 class Display;

--- a/src/libGLESv2/renderer/d3d11/renderer11_utils.cpp
+++ b/src/libGLESv2/renderer/d3d11/renderer11_utils.cpp
@@ -161,7 +161,7 @@ D3D11_FILTER ConvertFilter(GLenum minFilter, GLenum magFilter, float maxAnisotro
    if (maxAnisotropy > 1.0f)
    {
-        return D3D11_ENCODE_ANISOTROPIC_FILTER(comparison);
+        return D3D11_ENCODE_ANISOTROPIC_FILTER(static_cast<D3D11_COMPARISON_FUNC>(comparison));
    }
    else
    {
@@ -186,7 +186,7 @@ D3D11_FILTER ConvertFilter(GLenum minFilter, GLenum magFilter, float maxAnisotro
          default:         UNREACHABLE();
        }
-        return D3D11_ENCODE_BASIC_FILTER(dxMin, dxMag, dxMip, comparison);
+        return D3D11_ENCODE_BASIC_FILTER(dxMin, dxMag, dxMip, static_cast<D3D11_COMPARISON_FUNC>(comparison));
    }
 }

--- a/src/libGLESv2/renderer/d3d9/Renderer9.cpp
+++ b/src/libGLESv2/renderer/d3d9/Renderer9.cpp
@@ -35,6 +35,7 @@
 #include "libEGL/Display.h"
 #include "third_party/trace_event/trace_event.h"
+#include "third_party/systeminfo/SystemInfo.h"
 // Can also be enabled by defining FORCE_REF_RAST in the project's predefined macros
 #define REF_RAST 0
@@ -266,7 +267,7 @@ EGLint Renderer9::initialize()
    mSupportsNonPower2Textures = !(mDeviceCaps.TextureCaps & D3DPTEXTURECAPS_POW2) &&
        !(mDeviceCaps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) &&
        !(mDeviceCaps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) &&
-        !(getComparableOSVersion() < versionWindowsVista && mAdapterIdentifier.VendorId == VENDOR_ID_AMD);
+        !(!isWindowsVistaOrGreater() && mAdapterIdentifier.VendorId == VENDOR_ID_AMD);
    // Must support a minimum of 2:1 anisotropy for max anisotropy to be considered supported, per the spec
    mSupportsTextureFilterAnisotropy = ((mDeviceCaps.RasterCaps & D3DPRASTERCAPS_ANISOTROPY) && (mDeviceCaps.MaxAnisotropy >= 2));

--- a/src/third_party/systeminfo/SystemInfo.cpp
+++ b/src/third_party/systeminfo/SystemInfo.cpp
+/*
+ * Copyright (C) 2009 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#if _WIN32_WINNT_WINBLUE
+#include <versionhelpers.h>
+#endif
+#include <windows.h>
+namespace rx {
+#ifndef _WIN32_WINNT_WINBLUE
+static bool IsWindowsVistaOrGreater()
+{
+    OSVERSIONINFOEXW osvi = { };
+    osvi.dwOSVersionInfoSize = sizeof(osvi);
+    osvi.dwMajorVersion = HIBYTE(_WIN32_WINNT_VISTA);
+    osvi.dwMinorVersion = LOBYTE(_WIN32_WINNT_VISTA);
+    DWORDLONG condition = 0;
+    VER_SET_CONDITION(condition, VER_MAJORVERSION, VER_GREATER_EQUAL);
+    VER_SET_CONDITION(condition, VER_MINORVERSION, VER_GREATER_EQUAL);
+    return !!::VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION, condition);
+}
+#endif
+bool isWindowsVistaOrGreater()
+{
+    static bool initialized = false;
+    static bool cachedIsWindowsVistaOrGreater;
+    if (!initialized) {
+        initialized = true;
+        cachedIsWindowsVistaOrGreater = IsWindowsVistaOrGreater();
+    }
+    return cachedIsWindowsVistaOrGreater;
+}
+} // namespace rx
--- a/src/third_party/systeminfo/SystemInfo.h
+++ b/src/third_party/systeminfo/SystemInfo.h
+/*
+ * Copyright (C) 2009 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SystemInfo_h
+#define SystemInfo_h
+namespace rx {
+bool isWindowsVistaOrGreater();
+} // namespace rx
+#endif // SystemInfo_h