summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Li <samuel.li@amd.com>2014-03-18 12:28:50 -0400
committerAlex Deucher <alexander.deucher@amd.com>2014-06-09 13:48:54 -0400
commit0fe45a489b33ab72a1811dc8492eb41950ad7253 (patch)
tree8a95f85261e4a857b42b9d847be9a81398af01b8
parenta4fbc7732a1e56de385f50b778aafbdd186e015c (diff)
glamor: Revert a context related change. It caused a compilation error since context switcher related changes have not been pulled into this tree. This reverts commit 73ab7f4.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/glamor.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/glamor.c b/src/glamor.c
index eb9c0ee..52e2f21 100644
--- a/src/glamor.c
+++ b/src/glamor.c
@@ -225,8 +225,6 @@ glamor_block_handler(ScreenPtr screen)
glamor_get_screen_private(screen);
glamor_gl_dispatch *dispatch;
- assert(!glamor_priv->ctx.get_count);
-
dispatch = glamor_get_dispatch(glamor_priv);
glamor_priv->tick++;
dispatch->glFlush();
@@ -244,11 +242,7 @@ _glamor_block_handler(void *data, OSTimePtr timeout,
void *last_select_mask)
{
glamor_screen_private *glamor_priv = data;
- glamor_gl_dispatch *dispatch;
-
- assert(!glamor_priv->ctx.get_count);
-
- dispatch = glamor_get_dispatch(glamor_priv);
+ glamor_gl_dispatch *dispatch = glamor_get_dispatch(glamor_priv);
dispatch->glFlush();
glamor_put_dispatch(glamor_priv);
}