summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker/st_context.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-01-04 11:47:39 -0700
committerBrian Paul <[email protected]>2010-01-04 11:47:39 -0700
commit0fb1eaddfbaf487067e0ff4f1d6f82145b6b0acd (patch)
tree0f3f0239f09d5681e38a474259e018ba34a160a2 /src/mesa/state_tracker/st_context.c
parent195568e4cb0524d71db0ac68cf5a95b33a1af6b4 (diff)
parentc9b558351847133dced0c9daaeb84d57d550afc9 (diff)
Merge branch 'gallium-conditional-rendering'
Diffstat (limited to 'src/mesa/state_tracker/st_context.c')
-rw-r--r--src/mesa/state_tracker/st_context.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index d18a25ab514..e4f18c842ca 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -43,6 +43,7 @@
#include "st_cb_blit.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_clear.h"
+#include "st_cb_condrender.h"
#if FEATURE_drawpix
#include "st_cb_drawpixels.h"
#include "st_cb_rasterpos.h"
@@ -337,6 +338,7 @@ void st_init_driver_functions(struct dd_function_table *functions)
#if FEATURE_queryobj
st_init_query_functions(functions);
#endif
+ st_init_cond_render_functions(functions);
st_init_readpixels_functions(functions);
st_init_texture_functions(functions);
st_init_flush_functions(functions);