diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:20:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 09:30:54 +0000 |
| commit | d26d06ed332166d6f61a5c06ab85aee5d987b2b6 (patch) | |
| tree | 101729a45ae70b06e2586f5c66730f9e2524f3b5 /chromium/third_party/angle | |
| parent | 47c928e8a4986fa683c5763762fa0069c9b3debe (diff) | |
| download | qtwebengine-chromium-d26d06ed332166d6f61a5c06ab85aee5d987b2b6.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.91
And adds sources hunspell dictionary convertion tool.
Change-Id: Ifb016b018e7b7cc5a2c56d8e4c1b1b563bd5eaed
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'chromium/third_party/angle')
| -rw-r--r-- | chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp index 7351c2ad0c0..f047a65d7a6 100644 --- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp +++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp @@ -453,7 +453,9 @@ gl::Error StateManager11::setDepthStencilState(const gl::State &glState) gl::Error StateManager11::setRasterizerState(const gl::RasterizerState &rasterState) { - if (!mRasterizerStateIsDirty) + // TODO: Remove pointDrawMode and multiSample from gl::RasterizerState. + if (!mRasterizerStateIsDirty && rasterState.pointDrawMode == mCurRasterState.pointDrawMode && + rasterState.multiSample == mCurRasterState.multiSample) { return gl::Error(GL_NO_ERROR); } |