Title: [171610] trunk/Source/ThirdParty/ANGLE
- Revision
- 171610
- Author
- [email protected]
- Date
- 2014-07-25 13:07:34 -0700 (Fri, 25 Jul 2014)
Log Message
[Win][ANGLE] Enable D3D11.
https://bugs.webkit.org/show_bug.cgi?id=135296
Patch by [email protected] <[email protected]> on 2014-07-25
Reviewed by Alex Christensen.
Direct3D 11 is not enabled on Windows.
* ANGLE.vcxproj/libGLESv2.vcxproj: Added files.
* ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
* ANGLE.vcxproj/libGLESv2Common.props: Enable D3D11.
* src/libGLESv2/precompiled.h: Header file does not exist, avoid include.
* changes.diff: Updated diff.
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (171609 => 171610)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-07-25 19:39:25 UTC (rev 171609)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2014-07-25 20:07:34 UTC (rev 171610)
@@ -163,6 +163,24 @@
<ClCompile Include="..\src\libGLESv2\queryconversions.cpp" />
<ClCompile Include="..\src\libGLESv2\RenderbufferProxySet.cpp" />
<ClCompile Include="..\src\libGLESv2\renderer\copyimage.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Blit11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Clear11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Fence11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\formatutils11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Image11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Query11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Renderer11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp" />
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp" />
<ClCompile Include="..\src\libGLESv2\renderer\d3d9\Blit9.cpp" />
<ClCompile Include="..\src\libGLESv2\renderer\d3d9\formatutils9.cpp" />
<ClCompile Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp" />
@@ -261,6 +279,24 @@
<ClInclude Include="..\src\libGLESv2\RenderbufferProxySet.h" />
<ClInclude Include="..\src\libGLESv2\renderer\copyimage.h" />
<ClInclude Include="..\src\libGLESv2\renderer\copyvertex.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Blit11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Clear11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Fence11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\formatutils11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Image11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\PixelTransfer11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Query11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Renderer11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.h" />
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h" />
<ClInclude Include="..\src\libGLESv2\renderer\d3d9\Blit9.h" />
<ClInclude Include="..\src\libGLESv2\renderer\d3d9\formatutils9.h" />
<ClInclude Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.h" />
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters (171609 => 171610)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2014-07-25 19:39:25 UTC (rev 171609)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters 2014-07-25 20:07:34 UTC (rev 171610)
@@ -39,6 +39,9 @@
<Filter Include="Source Files\Renderer\d3d">
<UniqueIdentifier>{97836edd-b435-437e-9a3e-eb4f2a457f67}</UniqueIdentifier>
</Filter>
+ <Filter Include="Source Files\Renderer\d3d11">
+ <UniqueIdentifier>{3f2b4d24-ef33-460a-82a2-90b427a483e9}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\libGLESv2\Context.cpp">
@@ -224,6 +227,60 @@
<ClCompile Include="..\src\libGLESv2\renderer\d3d\HLSLCompiler.cpp">
<Filter>Source Files\Renderer\d3d</Filter>
</ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Blit11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Clear11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Fence11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\formatutils11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Image11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\PixelTransfer11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Query11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\Renderer11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.cpp">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\libGLESv2\BinaryStream.h">
@@ -514,6 +571,60 @@
<ClInclude Include="..\include\GLES2\gl2softlinking.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Blit11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\BufferStorage11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Clear11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Fence11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\formatutils11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Image11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\IndexBuffer11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\PixelTransfer11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Query11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Renderer11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\renderer11_utils.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderTarget11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\ShaderExecutable11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\SwapChain11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\TextureStorage11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\libGLESv2\renderer\d3d11\VertexBuffer11.h">
+ <Filter>Source Files\Renderer\d3d11</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\src\libGLESv2\renderer\d3d11\shaders\Passthrough11.hlsl">
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props (171609 => 171610)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2014-07-25 19:39:25 UTC (rev 171609)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props 2014-07-25 20:07:34 UTC (rev 171610)
@@ -5,7 +5,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\src;..\src\libGLESv2;..\include;..\include\KHR;$(DXSDK_DIR)Include</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>ANGLE_ENABLE_D3D9;NOMINMAX;ANGLE_WEBKIT_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>ANGLE_ENABLE_D3D9;ANGLE_ENABLE_D3D11;NOMINMAX;ANGLE_WEBKIT_WIN;ANGLE_SKIP_DXGI_1_2_CHECK=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (171609 => 171610)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-07-25 19:39:25 UTC (rev 171609)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2014-07-25 20:07:34 UTC (rev 171610)
@@ -1,3 +1,18 @@
+2014-07-25 [email protected] <[email protected]>
+
+ [Win][ANGLE] Enable D3D11.
+ https://bugs.webkit.org/show_bug.cgi?id=135296
+
+ Reviewed by Alex Christensen.
+
+ Direct3D 11 is not enabled on Windows.
+
+ * ANGLE.vcxproj/libGLESv2.vcxproj: Added files.
+ * ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
+ * ANGLE.vcxproj/libGLESv2Common.props: Enable D3D11.
+ * src/libGLESv2/precompiled.h: Header file does not exist, avoid include.
+ * changes.diff: Updated diff.
+
2014-06-04 Alex Christensen <[email protected]>
Enable WebGL on Windows.
Modified: trunk/Source/ThirdParty/ANGLE/changes.diff (171609 => 171610)
--- trunk/Source/ThirdParty/ANGLE/changes.diff 2014-07-25 19:39:25 UTC (rev 171609)
+++ trunk/Source/ThirdParty/ANGLE/changes.diff 2014-07-25 20:07:34 UTC (rev 171610)
@@ -452,3 +452,16 @@
bool isAligned = (static_cast<size_t>(attrib.stride()) % alignment == 0) &&
(static_cast<size_t>(attrib.mOffset) % alignment == 0);
+diff --git a/src/libGLESv2/precompiled.h b/src/libGLESv2/precompiled.h
+index ceef507..a1da38c 100644
+--- a/src/libGLESv2/precompiled.h
++++ b/src/libGLESv2/precompiled.h
+@@ -46,6 +46,8 @@
+ #include <D3D10_1.h>
+ #include <D3D11.h>
+ #include <dxgi.h>
++#if !ANGLE_SKIP_DXGI_1_2_CHECK
+ #include <dxgi1_2.h>
++#endif
+ #include <D3Dcompiler.h>
+ #endif // ANGLE_ENABLE_D3D11
Modified: trunk/Source/ThirdParty/ANGLE/src/libGLESv2/precompiled.h (171609 => 171610)
--- trunk/Source/ThirdParty/ANGLE/src/libGLESv2/precompiled.h 2014-07-25 19:39:25 UTC (rev 171609)
+++ trunk/Source/ThirdParty/ANGLE/src/libGLESv2/precompiled.h 2014-07-25 20:07:34 UTC (rev 171610)
@@ -46,6 +46,8 @@
#include <D3D10_1.h>
#include <D3D11.h>
#include <dxgi.h>
+#if !ANGLE_SKIP_DXGI_1_2_CHECK
#include <dxgi1_2.h>
+#endif
#include <D3Dcompiler.h>
#endif // ANGLE_ENABLE_D3D11
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
