diff options
| author | Brian Paul <brianp@vmware.com> | 2010-01-22 12:17:02 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-01-22 12:17:02 -0700 |
| commit | 80a0a72f3daccc5087ebeda44c7ad89b6cb42b30 (patch) | |
| tree | ad9715afb670d04fc92e9a07854cf504bc502e1c /src | |
| parent | 61f79abe7733cdb08f3e436fce6a3a14fef97ac6 (diff) | |
| parent | dfee6d5f012afbbb1956984b5d63c9c9c763c8b4 (diff) | |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/gallium/auxiliary/draw/draw_context.c
src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
src/gallium/auxiliary/pipebuffer/Makefile
src/gallium/auxiliary/pipebuffer/SConscript
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/tgsi/tgsi_scan.c
src/gallium/drivers/i915/i915_surface.c
src/gallium/drivers/i915/i915_texture.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/softpipe/sp_prim_vbuf.c
src/gallium/state_trackers/xorg/xorg_dri2.c
src/gallium/winsys/drm/intel/gem/intel_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
src/mesa/state_tracker/st_cb_clear.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/trivial/tri-fbo-tex-mip.c | 1 | ||||
| -rw-r--r-- | src/xdemos/glxgears.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/trivial/tri-fbo-tex-mip.c b/src/trivial/tri-fbo-tex-mip.c index df4725c7..2e8fb74a 100644 --- a/src/trivial/tri-fbo-tex-mip.c +++ b/src/trivial/tri-fbo-tex-mip.c @@ -6,7 +6,6 @@ #include <assert.h> #include <stdio.h> #include <stdlib.h> -#include <math.h> /* For debug */ diff --git a/src/xdemos/glxgears.c b/src/xdemos/glxgears.c index 088f25a3..2993c824 100644 --- a/src/xdemos/glxgears.c +++ b/src/xdemos/glxgears.c @@ -771,6 +771,7 @@ main(int argc, char *argv[]) glDeleteLists(gear1, 1); glDeleteLists(gear2, 1); glDeleteLists(gear3, 1); + glXMakeCurrent(dpy, None, NULL); glXDestroyContext(dpy, ctx); XDestroyWindow(dpy, win); XCloseDisplay(dpy); |