Merge remote branch 'origin/lp-binning'

[mesa.git] / src / mesa / main / api_exec.c

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 6c3c98994aa289084cabca1d8a4a16fd158ed21c..e62c7aa57249e2fa8b4a81252ed99ac8baf6235c 100644 (file)
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -51,6 +51,7 @@
 #include "clear.h"
 #include "clip.h"
 #include "colortab.h"
+#include "condrender.h"
 #include "context.h"
 #include "convolve.h"
 #include "depth.h"
@@ -65,14 +66,12 @@
 #if FEATURE_EXT_framebuffer_object
 #include "fbobject.h"
 #endif
-#include "ffvertex_prog.h"
 #include "framebuffer.h"
 #include "hint.h"
 #include "histogram.h"
 #include "imports.h"
 #include "light.h"
 #include "lines.h"
-#include "macros.h"
 #include "matrix.h"
 #include "multisample.h"
 #include "pixel.h"
@@ -82,7 +81,6 @@
 #include "queryobj.h"
 #include "readpix.h"
 #include "scissor.h"
-#include "state.h"
 #include "stencil.h"
 #include "texenv.h"
 #include "texgetimage.h"
@@ -99,8 +97,6 @@
 #endif
 #if FEATURE_NV_fragment_program
 #include "shader/nvprogram.h"
-#include "shader/program.h"
-#include "texenvprogram.h"
 #endif
 #if FEATURE_ARB_shader_objects
 #include "shaders.h"
@@ -108,7 +104,6 @@
 #if FEATURE_ARB_sync
 #include "syncobj.h"
 #endif
-#include "debug.h"
 #include "glapi/dispatch.h"
 
 
@@ -754,4 +749,8 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_EnableIndexedEXT(exec, _mesa_EnableIndexed);
    SET_DisableIndexedEXT(exec, _mesa_DisableIndexed);
    SET_IsEnabledIndexedEXT(exec, _mesa_IsEnabledIndexed);
+
+   /* GL_NV_conditional_render */
+   SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender);
+   SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender);
 }