diff options
| author | Adam Jackson <ajax@redhat.com> | 2011-03-02 12:30:22 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2011-05-04 13:15:58 -0400 |
| commit | 00d1569918d0dca2cf2a5e2e320da7b427e1f69f (patch) | |
| tree | 58295910de2a326d0e219d360c69647c8d5d254e /hw | |
| parent | 522443dbf9edf618a158b8241afde5ab35f571f8 (diff) | |
glx: Remove noop dispatch table
We can never hit this, because the indirect GLX dispatch code always
forces a current context and checks that it's non-NULL before calling
into the dispatch table. If it's _not_ null, then _glapi_set_context
will call into the driver, which is responsible for calling
_glapi_set_dispatch to make sure the dispatch table is non-NULL.
Also remove _glapi_set_warning_func and friends, since we can no longer
call them even from dead code.
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
(cherry picked from commit b0c665ac0fe6840dda581e4d0d0b76c703d62a7b)
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xquartz/GL/indirect.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c index bdc7c3d50..1375beaa6 100644 --- a/hw/xquartz/GL/indirect.c +++ b/hw/xquartz/GL/indirect.c @@ -681,17 +681,8 @@ GLuint __glFloorLog2(GLuint val) return c; } -void warn_func(void * p1, char *format, ...) { - va_list v; - va_start(v, format); - vfprintf(stderr, format, v); - va_end(v); -} - static void setup_dispatch_table(void) { struct _glapi_table *disp=_glapi_get_dispatch(); - _glapi_set_warning_func((_glapi_warning_func)warn_func); - _glapi_noop_enable_warnings(TRUE); /* to update: * for f in $(grep 'define SET_' ../../../glx/dispatch.h | cut -f2 -d' ' | cut -f1 -d\( | sort -u); do grep -q $f indirect.c || echo $f ; done | grep -v by_offset | sed 's:SET_\(.*\)$:SET_\1(disp, gl\1)\;:' | pbcopy |