diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-09 11:02:37 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-09 11:02:37 +0000 |
| commit | 0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330 (patch) | |
| tree | eb8aa86b722ac91c775042bd84e152c29970529c /src/mesa/drivers/dri/nouveau/nv10_context.c | |
| parent | 95c5c69b505f562b61e23fa7dd500dbdd432a70d (diff) | |
| parent | 6f4ce4a4fed9f0f0f0ee89a63e406ab86dae7150 (diff) | |
Merge commit 'origin/master' into gallium-sw-api-2
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/softpipe/sp_winsys.h
src/gallium/state_trackers/egl/common/egl_g3d.c
src/gallium/state_trackers/egl/x11/native_x11.c
src/gallium/state_trackers/egl/x11/native_x11.h
src/gallium/state_trackers/egl/x11/native_ximage.c
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nv10_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv10_context.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv10_context.c b/src/mesa/drivers/dri/nouveau/nv10_context.c index 8e70c419ed..860d0aeb8f 100644 --- a/src/mesa/drivers/dri/nouveau/nv10_context.c +++ b/src/mesa/drivers/dri/nouveau/nv10_context.c @@ -370,7 +370,6 @@ const struct nouveau_driver nv10_driver = { nv10_emit_frag, nv10_emit_framebuffer, nv10_emit_fog, - nv10_emit_index_mask, nv10_emit_light_enable, nv10_emit_light_model, nv10_emit_light_source, |