Rebase against 9a80284e1a886ff7e01d33f68715c9bfdb773459.

This commit is contained in:
Sebastian Lackner
2016-05-19 20:06:07 +02:00
parent 9aefba7af5
commit f10c1d3c42
5 changed files with 27 additions and 27 deletions

View File

@@ -1,4 +1,4 @@
From 3b07128afb354df0304f1164ed28084b4619b933 Mon Sep 17 00:00:00 2001
From 26a7497a9fb1184080a1622f6a834bed50d2a239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 3 Jun 2015 22:57:21 +0200
Subject: winex11.drv: Allow changing the opengl pixel format on the desktop
@@ -43,7 +43,7 @@ index f5b1454..ac21f68 100644
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D10Device1 *)0xdeadbeef;
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 03b6113..e1c2e37 100644
index 04a369c..ee506f5 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -805,10 +805,22 @@ static void test_create_device(void)
@@ -74,10 +74,10 @@ index 03b6113..e1c2e37 100644
swapchain = (IDXGISwapChain *)0xdeadbeef;
device = (ID3D11Device *)0xdeadbeef;
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 8860bce..f1d6488 100644
index 4302f76..342f8d2 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -11122,6 +11122,21 @@ done:
@@ -11171,6 +11171,21 @@ static void test_get_render_target_data(void)
DestroyWindow(window);
}
@@ -99,10 +99,10 @@ index 8860bce..f1d6488 100644
START_TEST(device)
{
WNDCLASSA wc = {0};
@@ -11237,6 +11252,7 @@ START_TEST(device)
test_swapchain_parameters();
@@ -11287,6 +11302,7 @@ START_TEST(device)
test_check_device_format();
test_miptree_layout();
test_get_render_target_data();
+ test_desktop_window();
UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL));