summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
committerBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
commit1fa7789e828d1005e2473fc7cd364bd45eb30843 (patch)
tree5e3e1978e6cc511e90298622b7a04840a285782d /src/mesa
parent37e98e5cd217075d58456753ed8450dc116fe32c (diff)
parenteecd2a59c1205246cc220ab09a79988838bb1759 (diff)
Merge branch '7.8'
Conflicts: src/glx/dri2_glx.c src/glx/glx_pbuffer.c
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/glapi/glapi_nop.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/mesa/glapi/glapi_nop.c b/src/mesa/glapi/glapi_nop.c
index df9c587284..4257b1fbce 100644
--- a/src/mesa/glapi/glapi_nop.c
+++ b/src/mesa/glapi/glapi_nop.c
@@ -48,6 +48,26 @@
#include "glapi/glapi.h"
+
+/*
+ * These stubs are kept so that the old DRI drivers still load.
+ */
+PUBLIC void
+_glapi_noop_enable_warnings(GLboolean enable);
+
+PUBLIC void
+_glapi_set_warning_func(_glapi_proc func);
+
+void
+_glapi_noop_enable_warnings(GLboolean enable)
+{
+}
+
+void
+_glapi_set_warning_func(_glapi_proc func)
+{
+}
+
#ifdef DEBUG
/**