mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
import changes from `dev' branch of rmottola/Arctic-Fox:
- fix misspatch and apply Bug 1097803: Report succesful Direct2D 1.1 usage. r=jrmuizel (adc553e15) - Refactor graphics device initialization on Windows. (bug 1183910 part 1, r=mattwoodrow,bas) (af396b2aa) - Add a pref to force TDRs for graphics testing. (bug 1183910 part 2, r=mattwoodrow) (c35e7131c) - Bug 1157476 - Remove synchronous dispatch in AndroidMediaResourceServer::Start. r=cajbir (39033ed48) - Bug 1174055 - Remove WMFReader. r=jya (2890dc625) - Bug 1144638. Retry getting an active display link. r=mstange (c786816cf) - Bug 1154322 - Allow using skia for content rendering. r=jrmuizel (26413363e) - Bug 1161731: Remove newline characters from the ends of NS_WARNING messages in /gfx and /layout. r=mstange (820583f0f) - Bug 1147297. Fix assert vsync adjustment time on windows to be >=. r=jrmuizel (c65917a4a) - Bug 1147953. Fix vsync adjustment time to allow negative timestamps. r=jrmuizel (10a725baa) - Bug 1160157: Part 1. Uninitialized statics aren't really uninitialized, but it doesn't read well. r=jmuizelaar (e9e214c52) - minor tweaks (17a5ae1e4) - Remove D3D11Status flag in favor of FeatureStatus. (bug 1183910 part 3, r=mattwoodrow) (734eaec03)
This commit is contained in:
@@ -346,11 +346,11 @@ TextureClient::CreateForDrawing(ISurfaceAllocator* aAllocator,
|
||||
#ifdef XP_WIN
|
||||
LayersBackend parentBackend = aAllocator->GetCompositorBackendType();
|
||||
if (parentBackend == LayersBackend::LAYERS_D3D11 &&
|
||||
(aMoz2DBackend == gfx::BackendType::DIRECT2D ||
|
||||
aMoz2DBackend == gfx::BackendType::DIRECT2D1_1) &&
|
||||
gfxWindowsPlatform::GetPlatform()->GetD3D10Device() &&
|
||||
((aMoz2DBackend == gfx::BackendType::DIRECT2D && Factory::GetDirect3D10Device()) ||
|
||||
(aMoz2DBackend == gfx::BackendType::DIRECT2D1_1 && Factory::GetDirect3D11Device())) &&
|
||||
aSize.width <= maxTextureSize &&
|
||||
aSize.height <= maxTextureSize) {
|
||||
aSize.height <= maxTextureSize)
|
||||
{
|
||||
texture = new TextureClientD3D11(aAllocator, aFormat, aTextureFlags);
|
||||
}
|
||||
if (parentBackend == LayersBackend::LAYERS_D3D9 &&
|
||||
|
||||
Reference in New Issue
Block a user