Regenerate projects after last merge

Change-Id: I08ad1d497e65c89996f3794b71956b0ee7f322f8
microsoft · Dec 20, 2016 · f0b1b22 · f0b1b22
1 parent 89fa6c0
commit f0b1b22
Show file tree

Hide file tree

Showing 22 changed files with 4,970 additions and 202 deletions.
diff --git a/gyp/ANGLE.sln b/gyp/ANGLE.sln
diff --git a/gyp/All.vcxproj b/gyp/All.vcxproj
diff --git a/gyp/All.vcxproj.filters b/gyp/All.vcxproj.filters
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests">
+      <UniqueIdentifier>{71685B5B-5DB1-D3F0-6DF4-FE19B5454C87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party">
+      <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party\gpu_test_expectations">
+      <UniqueIdentifier>{484341C1-E2A8-4507-90AC-0D22FEF84E35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests">
+      <UniqueIdentifier>{71685B5B-5DB1-D3F0-6DF4-FE19B5454C87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party">
+      <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party\gpu_test_expectations">
+      <UniqueIdentifier>{484341C1-E2A8-4507-90AC-0D22FEF84E35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests">
+      <UniqueIdentifier>{71685B5B-5DB1-D3F0-6DF4-FE19B5454C87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party">
+      <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party\gpu_test_expectations">
+      <UniqueIdentifier>{484341C1-E2A8-4507-90AC-0D22FEF84E35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests">
+      <UniqueIdentifier>{71685B5B-5DB1-D3F0-6DF4-FE19B5454C87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party">
+      <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party\gpu_test_expectations">
+      <UniqueIdentifier>{484341C1-E2A8-4507-90AC-0D22FEF84E35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests">
+      <UniqueIdentifier>{71685B5B-5DB1-D3F0-6DF4-FE19B5454C87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party">
+      <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party\gpu_test_expectations">
+      <UniqueIdentifier>{484341C1-E2A8-4507-90AC-0D22FEF84E35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests">
+      <UniqueIdentifier>{71685B5B-5DB1-D3F0-6DF4-FE19B5454C87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party">
+      <UniqueIdentifier>{D6C6CEA7-AAD0-03AD-2394-AC6FCBF8A498}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\third_party\gpu_test_expectations">
+      <UniqueIdentifier>{484341C1-E2A8-4507-90AC-0D22FEF84E35}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests">
+      <UniqueIdentifier>{71685B5B-5DB1-D3F0-6DF4-FE19B5454C87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\src\tests\deqp_support">
+      <UniqueIdentifier>{B0F70ABC-08A9-A55B-CA3E-0062596FBCEF}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\tests\third_party\gpu_test_expectations\gpu_info.cc">
+      <Filter>..\src\tests\third_party\gpu_test_expectations</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\tests\third_party\gpu_test_expectations\gpu_info.h">
+      <Filter>..\src\tests\third_party\gpu_test_expectations</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\tests\third_party\gpu_test_expectations\gpu_test_config.cc">
+      <Filter>..\src\tests\third_party\gpu_test_expectations</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\tests\third_party\gpu_test_expectations\gpu_test_config.h">
+      <Filter>..\src\tests\third_party\gpu_test_expectations</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\tests\third_party\gpu_test_expectations\gpu_test_expectations_parser.cc">
+      <Filter>..\src\tests\third_party\gpu_test_expectations</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\tests\third_party\gpu_test_expectations\gpu_test_expectations_parser.h">
+      <Filter>..\src\tests\third_party\gpu_test_expectations</Filter>
+    </ClInclude>
+    <ClCompile Include="..\src\tests\deqp_support\angle_deqp_gtest.cpp">
+      <Filter>..\src\tests\deqp_support</Filter>
+    </ClCompile>
+    <None Include="ANGLE.gyp"/>
+  </ItemGroup>
+</Project>
diff --git a/samples/samples.gyp b/samples/samples.gyp
@@ -199,7 +199,7 @@
             'target_name': 'texture_loading_dds',
             'type': 'executable',
             'dependencies': [ 'sample_util' ],
-            'includes': [ '../build/common_defines.gypi', ],
+            'includes': [ '../gyp/common_defines.gypi', ],
             'sources': 
             [ 
                 'texture_loading_dds/DDSTextureLoader.cpp',
@@ -222,7 +222,7 @@
             'target_name': 'texture_loading_wic',
             'type': 'executable',
             'dependencies': [ 'sample_util' ],
-            'includes': [ '../build/common_defines.gypi', ],
+            'includes': [ '../gyp/common_defines.gypi', ],
             'sources': 
             [ 
                 'texture_loading_wic/WICTextureLoader.cpp',

diff --git a/src/libGLESv2/entry_points_egl_ext.cpp b/src/libGLESv2/entry_points_egl_ext.cpp
@@ -305,7 +305,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_disp
                             break;
 
                         default:
-                            SetGlobalError(egl::Error(EGL_SUCCESS));
+                            thread->setError(egl::Error(EGL_BAD_ATTRIBUTE));
                             return EGL_NO_DISPLAY;
                         }