summaryrefslogtreecommitdiff
path: root/glamor/glamor_addtraps.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-02-10 12:54:44 +0000
committerEric Anholt <eric@anholt.net>2013-12-18 11:23:48 -0800
commit556adfa6b90f4c1ef12635cf78fa0bba046cf123 (patch)
tree7366316bc77b9cab96eb654aa709ade22d50d722 /glamor/glamor_addtraps.c
parent430bc16ca03b3ea00255a4045c8e9fd11aea95ad (diff)
Fixup glx support
Renaming glamor_priv->dispatch and wrapping the access to the dispatch table with a function that also ensured the context was bound. dispatch = glamor_get_dispatch(glamor_priv); ... glamor_put_dispatch(glamor_priv); So that we catch all places where we attempt to call into GL withouta context. As an optimisation we can then do glamor_get_context(); glamor_put_context() around the rendering entry points to reduce the frequency of having to restore the old context. (Along with allowing the context to be recursively acquired and making the old context part of the glamor_egl state.) Reviewed-by: Zhigang Gong <zhigang.gong@linux.intel.com> Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'glamor/glamor_addtraps.c')
-rw-r--r--glamor/glamor_addtraps.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/glamor/glamor_addtraps.c b/glamor/glamor_addtraps.c
index 28775e561..ac852963c 100644
--- a/glamor/glamor_addtraps.c
+++ b/glamor/glamor_addtraps.c
@@ -26,10 +26,6 @@
*
*/
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
#include "glamor_priv.h"
static Bool