Attachment 42099 Details for Bug 33176 – fix d3d1x again

[patch] fix d3d1x again

0001-d3d1x-Fix-broken-build.patch (text/plain), 1.45 KB, created by Chia-I Wu on 2011-01-16 03:59:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chia-I Wu

Created: 2011-01-16 03:59:17 UTC

Size: 1.45 KB

patch

obsolete

>From ba2a1af95f4b88a2fa43946b47b19539710791ee Mon Sep 17 00:00:00 2001
>From: Chia-I Wu <olv@lunarg.com>
>Date: Sun, 16 Jan 2011 17:34:40 +0800
>Subject: [PATCH] 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);
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33176: 42098 | 42099

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.