diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 22:41:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 22:41:48 +0200 |
| commit | d26ea2f474c48afa7d3c261572da5d85b7b62bd8 (patch) | |
| tree | f4b1f3cac1b011283ae536868c3aee42bc14ff07 /xorg-server/glamor/glamor_utils.h | |
| parent | dda1497a1e88c6cb8b8d91a7bc61283b697e8ea0 (diff) | |
| download | vcxsrv-d26ea2f474c48afa7d3c261572da5d85b7b62bd8.tar.gz vcxsrv-d26ea2f474c48afa7d3c261572da5d85b7b62bd8.tar.bz2 vcxsrv-d26ea2f474c48afa7d3c261572da5d85b7b62bd8.zip | |
fontconfig mesa xserver xkeyboard-config pixman git update 23 Apr 2014
xserver commit 99f0365b1fbdfd9238b9f5cc28491e4e6c7324f1
xkeyboard-config commit b5eb5418e5a9d76b172faadf6901bc9c83f2ddad
pixman commit 5f661ee719be25c3aa0eb0d45e0db23a37e76468
fontconfig commit 81664fe54f117e4781fda5a30429b51858302e91
mesa commit fd92346c53ed32709c7b56ce58fb9c9bf43ce9a8
Diffstat (limited to 'xorg-server/glamor/glamor_utils.h')
| -rw-r--r-- | xorg-server/glamor/glamor_utils.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/xorg-server/glamor/glamor_utils.h b/xorg-server/glamor/glamor_utils.h index 53b7d9bec..4c1581ef5 100644 --- a/xorg-server/glamor/glamor_utils.h +++ b/xorg-server/glamor/glamor_utils.h @@ -1499,15 +1499,12 @@ __fls(unsigned long x) #endif static inline void -glamor_get_context(glamor_screen_private * glamor_priv) +glamor_make_current(glamor_screen_private *glamor_priv) { - glamor_priv->ctx.get_context(&glamor_priv->ctx); -} - -static inline void -glamor_put_context(glamor_screen_private * glamor_priv) -{ - glamor_priv->ctx.put_context(&glamor_priv->ctx); + if (lastGLContext != &glamor_priv->ctx) { + lastGLContext = &glamor_priv->ctx; + glamor_priv->ctx.make_current(&glamor_priv->ctx); + } } #endif |