Bug 1636122 - [angle] Use deviceContext instead of deviceContext1. r=jrmuizel
authorJeff Gilbert <jgilbert@mozilla.com>
Tue, 12 May 2020 01:22:38 +0000
changeset 529274 040a6d3c401de4142568a0c942f169244dc72a71
parent 529273 9923799dd260cb125fb149b92298034ca3beb112
child 529275 40835aba2708c6f2e3c14428945fa64857899a16
push id37406
push userdluca@mozilla.com
push dateTue, 12 May 2020 09:34:21 +0000
treeherdermozilla-central@1706d4d54ec6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel
bugs1636122
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1636122 - [angle] Use deviceContext instead of deviceContext1. r=jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D74770
gfx/angle/checkout/out/gen/angle/id/commit.h
gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
gfx/angle/cherry_picks.txt
--- a/gfx/angle/checkout/out/gen/angle/id/commit.h
+++ b/gfx/angle/checkout/out/gen/angle/id/commit.h
@@ -1,3 +1,3 @@
-#define ANGLE_COMMIT_HASH "8df54289d717"
+#define ANGLE_COMMIT_HASH "eabf2a79aac3"
 #define ANGLE_COMMIT_HASH_SIZE 12
-#define ANGLE_COMMIT_DATE "2020-05-06 11:04:42 -0700"
+#define ANGLE_COMMIT_DATE "2020-05-11 10:58:02 -0700"
--- a/gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
+++ b/gfx/angle/checkout/src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
@@ -516,17 +516,17 @@ angle::Result Clear11::clearFramebuffer(
                                 return true;
                         default:
                                 return false;
             }};
             FLOAT blendFactor[4];
             UINT sampleMask;
             ID3D11BlendState *blendState;
             D3D11_BLEND_DESC blendDesc;
-            deviceContext1->OMGetBlendState(&blendState, blendFactor, &sampleMask);
+            deviceContext->OMGetBlendState(&blendState, blendFactor, &sampleMask);
             if (blendState) {
                     blendState->GetDesc(&blendDesc);
                     // You can only use dual source blending on slot 0 so only check there
                     if (isDualSource(blendDesc.RenderTarget[0].SrcBlend) ||
                         isDualSource(blendDesc.RenderTarget[0].DestBlend) ||
                         isDualSource(blendDesc.RenderTarget[0].SrcBlendAlpha) ||
                         isDualSource(blendDesc.RenderTarget[0].DestBlendAlpha)) {
                             canClearView = false;
--- a/gfx/angle/cherry_picks.txt
+++ b/gfx/angle/cherry_picks.txt
@@ -1,8 +1,17 @@
+commit eabf2a79aac36223b5ab5c5b0810d5522095f0bc
+Author: Jeff Muizelaar <jrmuizel@gmail.com>
+Date:   Mon May 11 13:01:46 2020 -0400
+
+    Use deviceContext instead of deviceContext1 (#24)
+    
+    Sometimes we don't have a deviceContext1 (on Win7) and would crash. We
+    on't have any need to use it so just use deviceContext.
+
 commit 19f1bef071c32df60d9d62a7907c42270d0a3dd7
 Author: Jeff Muizelaar <jrmuizel@gmail.com>
 Date:   Fri May 8 15:08:24 2020 -0400
 
     Handle a null blend state. (#23)
     
     Null is used as the default blend state so we have to check for it.