Mesa (master): st/wgl: make stw_lookup_context_locked() an inline function
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Fri May 30 17:52:53 UTC 2014
Module: Mesa
Branch: master
Commit: f9595e21bc97c114ffac8ef41209cc5f7aaa8b05
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9595e21bc97c114ffac8ef41209cc5f7aaa8b05
Author: Brian Paul <brianp at vmware.com>
Date: Wed May 21 11:32:30 2014 -0600
st/wgl: make stw_lookup_context_locked() an inline function
Reviewed-by: Charmaine Lee <charmainel at vmware.com>
---
src/gallium/state_trackers/wgl/stw_device.c | 13 -------------
src/gallium/state_trackers/wgl/stw_device.h | 11 +++++++++--
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c
index c808700..8f2cf9c 100644
--- a/src/gallium/state_trackers/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/stw_device.c
@@ -190,19 +190,6 @@ stw_cleanup(void)
}
-struct stw_context *
-stw_lookup_context_locked( DHGLRC dhglrc )
-{
- if (dhglrc == 0)
- return NULL;
-
- if (stw_dev == NULL)
- return NULL;
-
- return (struct stw_context *) handle_table_get(stw_dev->ctx_table, dhglrc);
-}
-
-
void APIENTRY
DrvSetCallbackProcs(
INT nProcs,
diff --git a/src/gallium/state_trackers/wgl/stw_device.h b/src/gallium/state_trackers/wgl/stw_device.h
index 561d693..4a930b5 100644
--- a/src/gallium/state_trackers/wgl/stw_device.h
+++ b/src/gallium/state_trackers/wgl/stw_device.h
@@ -76,10 +76,17 @@ struct stw_device
#endif
};
-struct stw_context *
-stw_lookup_context_locked( DHGLRC hglrc );
extern struct stw_device *stw_dev;
+static INLINE struct stw_context *
+stw_lookup_context_locked( DHGLRC dhglrc )
+{
+ if (dhglrc == 0 || stw_dev == NULL)
+ return NULL;
+ return (struct stw_context *) handle_table_get(stw_dev->ctx_table, dhglrc);
+}
+
+
#endif /* STW_DEVICE_H_ */
More information about the mesa-commit
mailing list