Mesa (master): d3d1x: fix a build error

Chia-I Wu olv at kemper.freedesktop.org
Fri Sep 9 07:48:27 UTC 2011


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

Author: Chia-I Wu <olv at lunarg.com>
Date:   Fri Sep  9 11:59:50 2011 +0800

d3d1x: fix a build error

Fix for the st/egl interface change since
08e1076fd2d3f6fb879dd2529e7d035d6a399da2.

---

 .../state_trackers/d3d1x/dxgi/src/dxgi_native.cpp  |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 0c80738..2bf0012 100644
--- a/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
+++ b/src/gallium/state_trackers/d3d1x/dxgi/src/dxgi_native.cpp
@@ -1106,7 +1106,7 @@ struct GalliumDXGISwapChain : public GalliumDXGIObject<IDXGISwapChain, GalliumDX
 		struct pipe_resource* dst;
 		struct pipe_resource* src;
 		struct pipe_surface* dst_surface;
-		enum native_attachment att;
+		struct native_present_control ctrl;
 
 		void* present_cookie;
 		hr = parent->backend->BeginPresent(desc.OutputWindow, &present_cookie, &cur_window, &rect, &rgndata, &preserve_aspect_ratio);
@@ -1236,8 +1236,9 @@ struct GalliumDXGISwapChain : public GalliumDXGIObject<IDXGISwapChain, GalliumDX
 
                 pipe->flush(pipe, 0);
 
-		att = (db) ? NATIVE_ATTACHMENT_BACK_LEFT : NATIVE_ATTACHMENT_FRONT_LEFT;
-		if(!surface->present(surface, att, FALSE, 0))
+		memset(&ctrl, 0, sizeof(ctrl));
+		ctrl.natt = (db) ? NATIVE_ATTACHMENT_BACK_LEFT : NATIVE_ATTACHMENT_FRONT_LEFT;
+		if(!surface->present(surface, &ctrl))
 			return DXGI_ERROR_DEVICE_REMOVED;
 
 end_present:




More information about the mesa-commit mailing list