Mesa (master): d3d1x: Fix broken build.

Chia-I Wu olv at kemper.freedesktop.org
Sun Jan 16 12:58:26 UTC 2011


Module: Mesa
Branch: master
Commit: 326332a130baa732805489565ed806ce344cc1f6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=326332a130baa732805489565ed806ce344cc1f6

Author: Chia-I Wu <olv at lunarg.com>
Date:   Sun Jan 16 17:34:40 2011 +0800

d3d1x: Fix broken build.

st/egl native.h changed its interface in
a22a332fc7cc54d4d0973dcd21a90159cc51de1a.

---

 .../state_trackers/d3d1x/dxgi/src/dxgi_native.cpp  |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp b/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
index a54324a..2ff24e1 100644
--- a/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
+++ b/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
@@ -256,11 +256,16 @@ struct GalliumDXGIAdapter
 	{
 		this->parent = factory;
 
+                /* FIXME handler should be static */
 		handler.invalid_surface = handle_invalid_surface;
 		handler.new_drm_screen = dxgi_loader_create_drm_screen;
 		handler.new_sw_screen = dxgi_loader_create_sw_screen;
-		display = platform->create_display(dpy, &handler, this);
+		platform->set_event_handler(&handler);
+
+		display = platform->create_display(dpy, FALSE, this);
 		if(!display)
+                   display = platform->create_display(dpy, TRUE, this);
+                if(!display)
 			throw E_FAIL;
 		memset(&desc, 0, sizeof(desc));
 		std::string s = std::string("GalliumD3D on ") + display->screen->get_name(display->screen) + " by " + display->screen->get_vendor(display->screen);




More information about the mesa-commit mailing list