Closed
Bug 870724
Opened 12 years ago
Closed 12 years ago
Fixup D3D11 types for builds with Win8 SDK and moz SDK version of 601
Categories
(Core :: General, defect)
Tracking
()
RESOLVED
FIXED
mozilla23
People
(Reporter: jimm, Assigned: jimm)
References
Details
Attachments
(1 file)
(deleted),
patch
|
khuey
:
review+
|
Details | Diff | Splinter Review |
https://bugzilla.mozilla.org/attachment.cgi?id=747398&action=edit
This needs another update for devs who build without enable-metro.
Assignee | ||
Comment 1•12 years ago
|
||
d3dcommon.h is available in both d3d sdk sources we support. If you are using the win8 sdk (and have your paths set right) the 8.0 sdk version should get included. Otherwise the June 2010 d3d sdk should get included.
Only thing I'm not too sure about is if this needs to be wrapped in some sort of D3D ifdef. Doesn't seem like it since we require D3D headers to build, so I think checks like CAIRO_HAS_D2D_SURFACE are obsolete.
Attachment #747910 -
Flags: review?(khuey)
Comment 2•12 years ago
|
||
FWIW, this is causing Windows B2G desktop build bustage as well (which we didn't notice because they're hidden by default on inbound/m-c).
Comment 3•12 years ago
|
||
When this patch gets r+, please land it on birch rather than inbound.
Assignee | ||
Comment 4•12 years ago
|
||
Comment on attachment 747910 [details] [diff] [review]
patch
whoever gets to it first.
Attachment #747910 -
Flags: review?(bas)
Comment on attachment 747910 [details] [diff] [review]
patch
Review of attachment 747910 [details] [diff] [review]:
-----------------------------------------------------------------
::: gfx/thebes/gfxWindowsPlatform.h
@@ +33,5 @@
> #ifdef CAIRO_HAS_D2D_SURFACE
> #include <dxgi.h>
> #endif
>
> +// This header is available in the June 2010 SDK and in the Win8 SDK
nit: whitespace at eol.
Attachment #747910 -
Flags: review?(khuey) → review+
Assignee | ||
Comment 6•12 years ago
|
||
Assignee | ||
Updated•12 years ago
|
Attachment #747910 -
Flags: review?(bas)
Comment 7•12 years ago
|
||
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla23
Comment 8•12 years ago
|
||
Would't it be safer to test for the definition of each of these separately rather than assuming one being undefined means they all are? There might be another SDK 7 update that breaks this the way it is now.
You need to log in
before you can comment on or make changes to this bug.
Description
•