Bug 135296

Summary: [Win][ANGLE] Enable D3D11.
Product: WebKit Reporter: peavo
Component: WebKit Misc.Assignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: achristensen, bfulgham, commit-queue, dino, kondapallykalyan, roger_fong
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Attachments:
Description Flags
Patch
none
Patch none

Description peavo 2014-07-25 11:07:54 PDT 
Direct3D 11 is not enabled on Windows.
Comment 1 peavo 2014-07-25 11:20:19 PDT 
Created attachment 235527 [details]
Patch
Comment 2 WebKit Commit Bot 2014-07-25 11:21:16 PDT 
Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE
Comment 3 Alex Christensen 2014-07-25 11:25:32 PDT 
Comment on attachment 235527 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=235527&action=review

Does this work with the June 2010 DirectX SDK?  I think I tried this and didn't enable it because it couldn't find dxgi1_2.h

> Source/ThirdParty/ANGLE/src/libGLESv2/precompiled.h:51
> +#if !ANGLE_SKIP_DXGI_1_2_CHECK
>  #include <dxgi1_2.h>
> +#endif

Does it really compile without this?  Wow.  Just remove this line, then, and reflect the changes from ANGLE trunk in changes.diff and don't define ANGLE_SKIP_DXGI_1_2_CHECK.
Comment 4 peavo 2014-07-25 11:58:03 PDT 
(In reply to comment #3)
> (From update of attachment 235527 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=235527&action=review
> 
> Does this work with the June 2010 DirectX SDK?  I think I tried this and didn't enable it because it couldn't find dxgi1_2.h
> 
> > Source/ThirdParty/ANGLE/src/libGLESv2/precompiled.h:51
> > +#if !ANGLE_SKIP_DXGI_1_2_CHECK
> >  #include <dxgi1_2.h>
> > +#endif
> 
> Does it really compile without this?  Wow.  Just remove this line, then, and reflect the changes from ANGLE trunk in changes.diff and don't define ANGLE_SKIP_DXGI_1_2_CHECK.

I think we need to set ANGLE_SKIP_DXGI_1_2_CHECK = 1, since the define is used as guard in Renderer11.cpp (dxgi check).

It seems changes.diff is generated with git. I'm using svn, how do I create the diff?
Comment 5 Alex Christensen 2014-07-25 12:06:09 PDT 
Install git, do the command in ANGLE.plist, make your changes, call "git diff", and put that into changes.diff.

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
Comment 6 peavo 2014-07-25 12:27:55 PDT 
Created attachment 235537 [details]
Patch
Comment 7 peavo 2014-07-25 12:28:23 PDT 
(In reply to comment #5)
> Install git, do the command in ANGLE.plist, make your changes, call "git diff", and put that into changes.diff.
> 

Thanks :) Updated patch.
Comment 8 WebKit Commit Bot 2014-07-25 13:07:58 PDT 
Comment on attachment 235537 [details]
Patch

Clearing flags on attachment: 235537

Committed r171610: <http://trac.webkit.org/changeset/171610>
Comment 9 WebKit Commit Bot 2014-07-25 13:08:01 PDT 
All reviewed patches have been landed.  Closing bug.