Mesa (master): st/wgl: Use st_context_iface::share for DrvShareLists.
Chia-I Wu
olv at kemper.freedesktop.org
Thu Nov 18 03:57:31 UTC 2010
Module: Mesa
Branch: master
Commit: db1689c23629d2cf66a7a35ed0e899006ef2af52
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=db1689c23629d2cf66a7a35ed0e899006ef2af52
Author: Chia-I Wu <olv at lunarg.com>
Date: Thu Nov 11 00:21:12 2010 +0800
st/wgl: Use st_context_iface::share for DrvShareLists.
---
src/gallium/state_trackers/wgl/stw_context.c | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/gallium/state_trackers/wgl/stw_context.c b/src/gallium/state_trackers/wgl/stw_context.c
index 85878b4..86c0a28 100644
--- a/src/gallium/state_trackers/wgl/stw_context.c
+++ b/src/gallium/state_trackers/wgl/stw_context.c
@@ -29,12 +29,10 @@
#include "pipe/p_compiler.h"
#include "pipe/p_context.h"
+#include "pipe/p_state.h"
+#include "util/u_memory.h"
#include "state_tracker/st_api.h"
-/* for _mesa_share_state */
-#include "state_tracker/st_context.h"
-#include "main/core.h"
-
#include "stw_icd.h"
#include "stw_device.h"
#include "stw_winsys.h"
@@ -102,13 +100,8 @@ DrvShareLists(
ctx1 = stw_lookup_context_locked( dhglrc1 );
ctx2 = stw_lookup_context_locked( dhglrc2 );
- if (ctx1 && ctx2) {
- struct st_context *st1, *st2;
-
- st1 = (struct st_context *) ctx1->st;
- st2 = (struct st_context *) ctx2->st;
- ret = _mesa_share_state(st2->ctx, st1->ctx);
- }
+ if (ctx1 && ctx2 && ctx2->st->share)
+ ret = ctx2->st->share(ctx2->st, ctx1->st);
pipe_mutex_unlock( stw_dev->ctx_mutex );
More information about the mesa-commit
mailing list