11 files changed, 0 insertions, 741 deletions

diff --git a/src/mesa/pipe/nv50/Makefile b/src/mesa/pipe/nv50/Makefile
deleted file mode 100644
index d3d011b14b..0000000000
--- a/src/mesa/pipe/nv50/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nv50
-
-DRIVER_SOURCES = \
-	nv50_clear.c \
-	nv50_context.c \
-	nv50_draw.c \
-	nv50_miptree.c \
-	nv50_query.c \
-	nv50_state.c \
-	nv50_surface.c \
-	nv50_vbo.c
-
-C_SOURCES = \
-	$(COMMON_SOURCES) \
-	$(DRIVER_SOURCES)
-
-ASM_SOURCES = 
-
-include ../Makefile.template
-
-symlinks:
-
diff --git a/src/mesa/pipe/nv50/nv50_clear.c b/src/mesa/pipe/nv50/nv50_clear.c
deleted file mode 100644
index 552b92f72e..0000000000
--- a/src/mesa/pipe/nv50/nv50_clear.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_state.h"
-
-#include "nv50_context.h"
-
-void
-nv50_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-	   unsigned clearValue)
-{
-	pipe->surface_fill(pipe, ps, 0, 0, ps->width, ps->height, clearValue);
-}
diff --git a/src/mesa/pipe/nv50/nv50_context.c b/src/mesa/pipe/nv50/nv50_context.c
deleted file mode 100644
index 33c8eebb0b..0000000000
--- a/src/mesa/pipe/nv50/nv50_context.c
+++ /dev/null
@@ -1,202 +0,0 @@
-#include "pipe/draw/draw_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_winsys.h"
-#include "pipe/p_util.h"
-
-#include "nv50_context.h"
-
-static boolean
-nv50_is_format_supported(struct pipe_context *pipe, enum pipe_format format,
-			 uint type)
-{
-	return FALSE;
-}
-
-static const char *
-nv50_get_name(struct pipe_context *pipe)
-{
-	struct nv50_context *nv50 = (struct nv50_context *)pipe;
-	static char buffer[128];
-
-	snprintf(buffer, sizeof(buffer), "NV%02X", nv50->chipset);
-	return buffer;
-}
-
-static const char *
-nv50_get_vendor(struct pipe_context *pipe)
-{
-	return "nouveau";
-}
-
-static int
-nv50_get_param(struct pipe_context *pipe, int param)
-{
-	switch (param) {
-	case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:
-		return 32;
-	case PIPE_CAP_NPOT_TEXTURES:
-		return 0;
-	case PIPE_CAP_TWO_SIDED_STENCIL:
-		return 1;
-	case PIPE_CAP_GLSL:
-		return 0;
-	case PIPE_CAP_S3TC:
-		return 0;
-	case PIPE_CAP_ANISOTROPIC_FILTER:
-		return 0;
-	case PIPE_CAP_POINT_SPRITE:
-		return 0;
-	case PIPE_CAP_MAX_RENDER_TARGETS:
-		return 8;
-	case PIPE_CAP_OCCLUSION_QUERY:
-		return 0;
-	case PIPE_CAP_TEXTURE_SHADOW_MAP:
-		return 0;
-	case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
-		return 13;
-	case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
-		return 10;
-	case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
-		return 13;
-	default:
-		NOUVEAU_ERR("Unknown PIPE_CAP %d\n", param);
-		return 0;
-	}
-}
-
-static float
-nv50_get_paramf(struct pipe_context *pipe, int param)
-{
-	switch (param) {
-	case PIPE_CAP_MAX_LINE_WIDTH:
-	case PIPE_CAP_MAX_LINE_WIDTH_AA:
-		return 10.0;
-	case PIPE_CAP_MAX_POINT_WIDTH:
-	case PIPE_CAP_MAX_POINT_WIDTH_AA:
-		return 64.0;
-	case PIPE_CAP_MAX_TEXTURE_ANISOTROPY:
-		return 16.0;
-	case PIPE_CAP_MAX_TEXTURE_LOD_BIAS:
-		return 4.0;
-	default:
-		NOUVEAU_ERR("Unknown PIPE_CAP %d\n", param);
-		return 0.0;
-	}
-}
-
-static void
-nv50_flush(struct pipe_context *pipe, unsigned flags)
-{
-	struct nv50_context *nv50 = (struct nv50_context *)pipe;
-	struct nouveau_winsys *nvws = nv50->nvws;
-	
-	if (flags & PIPE_FLUSH_WAIT) {
-		nvws->notifier_reset(nv50->sync, 0);
-		BEGIN_RING(tesla, 0x104, 1);
-		OUT_RING  (0);
-		BEGIN_RING(tesla, 0x100, 1);
-		OUT_RING  (0);
-	}
-
-	FIRE_RING();
-
-	if (flags & PIPE_FLUSH_WAIT)
-		nvws->notifier_wait(nv50->sync, 0, 0, 2000);
-}
-
-static void
-nv50_destroy(struct pipe_context *pipe)
-{
-	struct nv50_context *nv50 = (struct nv50_context *)pipe;
-
-	draw_destroy(nv50->draw);
-	free(nv50);
-}
-
-static boolean
-nv50_init_hwctx(struct nv50_context *nv50, int tesla_class)
-{
-	struct nouveau_winsys *nvws = nv50->nvws;
-	int ret;
-
-	if ((ret = nvws->grobj_alloc(nvws, tesla_class, &nv50->tesla))) {
-		NOUVEAU_ERR("Error creating 3D object: %d\n", ret);
-		return FALSE;
-	}
-
-	BEGIN_RING(tesla, NV50TCL_DMA_NOTIFY, 1);
-	OUT_RING  (nv50->sync->handle);
-
-	FIRE_RING ();
-	return TRUE;
-}
-
-#define GRCLASS5097_CHIPSETS 0x00000000
-#define GRCLASS8297_CHIPSETS 0x00000010
-struct pipe_context *
-nv50_create(struct pipe_winsys *pipe_winsys, struct nouveau_winsys *nvws,
-	    unsigned chipset)
-{
-	struct nv50_context *nv50;
-	int tesla_class, ret;
-
-	if ((chipset & 0xf0) != 0x50 && (chipset & 0xf0) != 0x80) {
-		NOUVEAU_ERR("Not a G8x chipset\n");
-		return NULL;
-	}
-
-	if (GRCLASS5097_CHIPSETS & (1 << (chipset & 0x0f))) {
-		tesla_class = 0x5097;
-	} else
-	if (GRCLASS8297_CHIPSETS & (1 << (chipset & 0x0f))) {
-		tesla_class = 0x8297;
-	} else {
-		NOUVEAU_ERR("Unknown G8x chipset: NV%02x\n", chipset);
-		return NULL;
-	}
-
-	nv50 = CALLOC_STRUCT(nv50_context);
-	if (!nv50)
-		return NULL;
-	nv50->chipset = chipset;
-	nv50->nvws = nvws;
-
-	if ((ret = nvws->notifier_alloc(nvws, 1, &nv50->sync))) {
-		NOUVEAU_ERR("Error creating notifier object: %d\n", ret);
-		free(nv50);
-		return NULL;
-	}
-
-	if (!nv50_init_hwctx(nv50, tesla_class)) {
-		free(nv50);
-		return NULL;
-	}
-
-	nv50->pipe.winsys = pipe_winsys;
-
-	nv50->pipe.destroy = nv50_destroy;
-	nv50->pipe.is_format_supported = nv50_is_format_supported;
-	nv50->pipe.get_name = nv50_get_name;
-	nv50->pipe.get_vendor = nv50_get_vendor;
-	nv50->pipe.get_param = nv50_get_param;
-	nv50->pipe.get_paramf = nv50_get_paramf;
-
-	nv50->pipe.draw_arrays = nv50_draw_arrays;
-	nv50->pipe.draw_elements = nv50_draw_elements;
-	nv50->pipe.clear = nv50_clear;
-
-	nv50->pipe.flush = nv50_flush;
-
-	nv50_init_miptree_functions(nv50);
-	nv50_init_surface_functions(nv50);
-	nv50_init_state_functions(nv50);
-	nv50_init_query_functions(nv50);
-
-	nv50->draw = draw_create();
-	assert(nv50->draw);
-	draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50));
-
-	return &nv50->pipe;
-}
-
-		
diff --git a/src/mesa/pipe/nv50/nv50_context.h b/src/mesa/pipe/nv50/nv50_context.h
deleted file mode 100644
index 5491c0cbb5..0000000000
--- a/src/mesa/pipe/nv50/nv50_context.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef __NV50_CONTEXT_H__
-#define __NV50_CONTEXT_H__
-
-#include "pipe/p_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_state.h"
-
-#include "pipe/draw/draw_vertex.h"
-
-#include "pipe/nouveau/nouveau_winsys.h"
-#include "pipe/nouveau/nouveau_gldefs.h"
-
-#define NOUVEAU_PUSH_CONTEXT(ctx)                                              \
-	struct nv50_context *ctx = nv50
-#include "pipe/nouveau/nouveau_push.h"
-
-#include "nv50_state.h"
-
-#define NOUVEAU_ERR(fmt, args...) \
-	fprintf(stderr, "%s:%d -  "fmt, __func__, __LINE__, ##args);
-#define NOUVEAU_MSG(fmt, args...) \
-	fprintf(stderr, "nouveau: "fmt, ##args);
-
-struct nv50_context {
-	struct pipe_context pipe;
-	struct nouveau_winsys *nvws;
-
-	struct draw_context *draw;
-
-	int chipset;
-	struct nouveau_grobj *tesla;
-	struct nouveau_notifier *sync;
-};
-
-
-extern void nv50_init_miptree_functions(struct nv50_context *nv50);
-extern void nv50_init_surface_functions(struct nv50_context *nv50);
-extern void nv50_init_state_functions(struct nv50_context *nv50);
-extern void nv50_init_query_functions(struct nv50_context *nv50);
-
-/* nv50_draw.c */
-extern struct draw_stage *nv50_draw_render_stage(struct nv50_context *nv50);
-
-/* nv50_vbo.c */
-extern boolean nv50_draw_arrays(struct pipe_context *, unsigned mode,
-				unsigned start, unsigned count);
-extern boolean nv50_draw_elements(struct pipe_context *pipe,
-				  struct pipe_buffer *indexBuffer,
-				  unsigned indexSize,
-				  unsigned mode, unsigned start,
-				  unsigned count);
-
-/* nv50_clear.c */
-extern void nv50_clear(struct pipe_context *pipe, struct pipe_surface *ps,
-		       unsigned clearValue);
-
-#endif
diff --git a/src/mesa/pipe/nv50/nv50_draw.c b/src/mesa/pipe/nv50/nv50_draw.c
deleted file mode 100644
index 85d347f5e0..0000000000
--- a/src/mesa/pipe/nv50/nv50_draw.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "pipe/draw/draw_private.h"
-#include "pipe/p_util.h"
-
-#include "nv50_context.h"
-
-struct nv50_draw_stage {
-	struct draw_stage draw;
-	struct nv50_context *nv50;
-};
-
-static void
-nv50_draw_point(struct draw_stage *draw, struct prim_header *prim)
-{
-	NOUVEAU_ERR("\n");
-}
-
-static void
-nv50_draw_line(struct draw_stage *draw, struct prim_header *prim)
-{
-	NOUVEAU_ERR("\n");
-}
-
-static void
-nv50_draw_tri(struct draw_stage *draw, struct prim_header *prim)
-{
-	NOUVEAU_ERR("\n");
-}
-
-static void
-nv50_draw_flush(struct draw_stage *draw, unsigned flags)
-{
-}
-
-static void
-nv50_draw_reset_stipple_counter(struct draw_stage *draw)
-{
-	NOUVEAU_ERR("\n");
-}
-
-struct draw_stage *
-nv50_draw_render_stage(struct nv50_context *nv50)
-{
-	struct nv50_draw_stage *nv50draw = CALLOC_STRUCT(nv50_draw_stage);
-
-	nv50draw->nv50 = nv50;
-	nv50draw->draw.draw = nv50->draw;
-	nv50draw->draw.point = nv50_draw_point;
-	nv50draw->draw.line = nv50_draw_line;
-	nv50draw->draw.tri = nv50_draw_tri;
-	nv50draw->draw.flush = nv50_draw_flush;
-	nv50draw->draw.reset_stipple_counter = nv50_draw_reset_stipple_counter;
-
-	return &nv50draw->draw;
-}
-
diff --git a/src/mesa/pipe/nv50/nv50_miptree.c b/src/mesa/pipe/nv50/nv50_miptree.c
deleted file mode 100644
index 0c034ed438..0000000000
--- a/src/mesa/pipe/nv50/nv50_miptree.c
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "pipe/p_state.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_util.h"
-
-#include "nv50_context.h"
-
-static struct pipe_texture *
-nv50_miptree_create(struct pipe_context *pipe, const struct pipe_texture *pt)
-{
-	NOUVEAU_ERR("unimplemented\n");
-	return NULL;
-}
-
-static void
-nv50_miptree_release(struct pipe_context *pipe, struct pipe_texture **pt)
-{
-	NOUVEAU_ERR("unimplemented\n");
-}
-
-void
-nv50_init_miptree_functions(struct nv50_context *nv50)
-{
-	nv50->pipe.texture_create = nv50_miptree_create;
-	nv50->pipe.texture_release = nv50_miptree_release;
-}
diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/mesa/pipe/nv50/nv50_query.c
deleted file mode 100644
index d8c3491c2c..0000000000
--- a/src/mesa/pipe/nv50/nv50_query.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "pipe/p_context.h"
-
-#include "nv50_context.h"
-
-static struct pipe_query *
-nv50_query_create(struct pipe_context *pipe, unsigned type)
-{
-	NOUVEAU_ERR("unimplemented\n");
-	return NULL;
-}
-
-static void
-nv50_query_destroy(struct pipe_context *pipe, struct pipe_query *q)
-{
-	NOUVEAU_ERR("unimplemented\n");
-}
-
-static void
-nv50_query_begin(struct pipe_context *pipe, struct pipe_query *q)
-{
-	NOUVEAU_ERR("unimplemented\n");
-}
-
-static void
-nv50_query_end(struct pipe_context *pipe, struct pipe_query *q)
-{
-	NOUVEAU_ERR("unimplemented\n");
-}
-
-static boolean
-nv50_query_result(struct pipe_context *pipe, struct pipe_query *q,
-		  boolean wait, uint64 *result)
-{
-	NOUVEAU_ERR("unimplemented\n");
-	*result = 0xdeadcafe;
-	return TRUE;
-}
-
-void
-nv50_init_query_functions(struct nv50_context *nv50)
-{
-	nv50->pipe.create_query = nv50_query_create;
-	nv50->pipe.destroy_query = nv50_query_destroy;
-	nv50->pipe.begin_query = nv50_query_begin;
-	nv50->pipe.end_query = nv50_query_end;
-	nv50->pipe.get_query_result = nv50_query_result;
-}
diff --git a/src/mesa/pipe/nv50/nv50_state.c b/src/mesa/pipe/nv50/nv50_state.c
deleted file mode 100644
index 99dcab51b2..0000000000
--- a/src/mesa/pipe/nv50/nv50_state.c
+++ /dev/null
@@ -1,213 +0,0 @@
-#include "pipe/p_state.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_util.h"
-
-#include "nv50_context.h"
-#include "nv50_state.h"
-
-static void *
-nv50_blend_state_create(struct pipe_context *pipe,
-			const struct pipe_blend_state *cso)
-{
-	return NULL;
-}
-
-static void
-nv50_blend_state_bind(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void
-nv50_blend_state_delete(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void *
-nv50_sampler_state_create(struct pipe_context *pipe,
-			  const struct pipe_sampler_state *cso)
-{
-	return NULL;
-}
-
-static void
-nv50_sampler_state_bind(struct pipe_context *pipe, unsigned unit,
-			void *hwcso)
-{
-}
-
-static void
-nv50_sampler_state_delete(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void
-nv50_set_sampler_texture(struct pipe_context *pipe, unsigned unit,
-			 struct pipe_texture *pt)
-{
-}
-
-static void *
-nv50_rasterizer_state_create(struct pipe_context *pipe,
-			     const struct pipe_rasterizer_state *cso)
-{
-	return NULL;
-}
-
-static void
-nv50_rasterizer_state_bind(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void
-nv50_rasterizer_state_delete(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void *
-nv50_depth_stencil_alpha_state_create(struct pipe_context *pipe,
-			const struct pipe_depth_stencil_alpha_state *cso)
-{
-	return NULL;
-}
-
-static void
-nv50_depth_stencil_alpha_state_bind(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void
-nv50_depth_stencil_alpha_state_delete(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void *
-nv50_vp_state_create(struct pipe_context *pipe,
-		     const struct pipe_shader_state *cso)
-{
-	return NULL;
-}
-
-static void
-nv50_vp_state_bind(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void
-nv50_vp_state_delete(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void *
-nv50_fp_state_create(struct pipe_context *pipe,
-		     const struct pipe_shader_state *cso)
-{
-	return NULL;
-}
-
-static void
-nv50_fp_state_bind(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void
-nv50_fp_state_delete(struct pipe_context *pipe, void *hwcso)
-{
-}
-
-static void
-nv50_set_blend_color(struct pipe_context *pipe,
-		     const struct pipe_blend_color *bcol)
-{
-}
-
-static void
-nv50_set_clip_state(struct pipe_context *pipe,
-		    const struct pipe_clip_state *clip)
-{
-}
-
-static void
-nv50_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
-			 const struct pipe_constant_buffer *buf )
-{
-}
-
-static void
-nv50_set_framebuffer_state(struct pipe_context *pipe,
-			   const struct pipe_framebuffer_state *fb)
-{
-}
-
-static void
-nv50_set_polygon_stipple(struct pipe_context *pipe,
-			 const struct pipe_poly_stipple *stipple)
-{
-}
-
-static void
-nv50_set_scissor_state(struct pipe_context *pipe,
-		       const struct pipe_scissor_state *s)
-{
-}
-
-static void
-nv50_set_viewport_state(struct pipe_context *pipe,
-			const struct pipe_viewport_state *vpt)
-{
-}
-
-static void
-nv50_set_vertex_buffer(struct pipe_context *pipe, unsigned index,
-		       const struct pipe_vertex_buffer *vb)
-{
-}
-
-static void
-nv50_set_vertex_element(struct pipe_context *pipe, unsigned index,
-			const struct pipe_vertex_element *ve)
-{
-}
-
-void
-nv50_init_state_functions(struct nv50_context *nv50)
-{
-	nv50->pipe.create_blend_state = nv50_blend_state_create;
-	nv50->pipe.bind_blend_state = nv50_blend_state_bind;
-	nv50->pipe.delete_blend_state = nv50_blend_state_delete;
-
-	nv50->pipe.create_sampler_state = nv50_sampler_state_create;
-	nv50->pipe.bind_sampler_state = nv50_sampler_state_bind;
-	nv50->pipe.delete_sampler_state = nv50_sampler_state_delete;
-	nv50->pipe.set_sampler_texture = nv50_set_sampler_texture;
-
-	nv50->pipe.create_rasterizer_state = nv50_rasterizer_state_create;
-	nv50->pipe.bind_rasterizer_state = nv50_rasterizer_state_bind;
-	nv50->pipe.delete_rasterizer_state = nv50_rasterizer_state_delete;
-
-	nv50->pipe.create_depth_stencil_alpha_state =
-		nv50_depth_stencil_alpha_state_create;
-	nv50->pipe.bind_depth_stencil_alpha_state =
-		nv50_depth_stencil_alpha_state_bind;
-	nv50->pipe.delete_depth_stencil_alpha_state =
-		nv50_depth_stencil_alpha_state_delete;
-
-	nv50->pipe.create_vs_state = nv50_vp_state_create;
-	nv50->pipe.bind_vs_state = nv50_vp_state_bind;
-	nv50->pipe.delete_vs_state = nv50_vp_state_delete;
-
-	nv50->pipe.create_fs_state = nv50_fp_state_create;
-	nv50->pipe.bind_fs_state = nv50_fp_state_bind;
-	nv50->pipe.delete_fs_state = nv50_fp_state_delete;
-
-	nv50->pipe.set_blend_color = nv50_set_blend_color;
-	nv50->pipe.set_clip_state = nv50_set_clip_state;
-	nv50->pipe.set_constant_buffer = nv50_set_constant_buffer;
-	nv50->pipe.set_framebuffer_state = nv50_set_framebuffer_state;
-	nv50->pipe.set_polygon_stipple = nv50_set_polygon_stipple;
-	nv50->pipe.set_scissor_state = nv50_set_scissor_state;
-	nv50->pipe.set_viewport_state = nv50_set_viewport_state;
-
-	nv50->pipe.set_vertex_buffer = nv50_set_vertex_buffer;
-	nv50->pipe.set_vertex_element = nv50_set_vertex_element;
-}
-
diff --git a/src/mesa/pipe/nv50/nv50_state.h b/src/mesa/pipe/nv50/nv50_state.h
deleted file mode 100644
index a3b781d4c6..0000000000
--- a/src/mesa/pipe/nv50/nv50_state.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __NV50_STATE_H__
-#define __NV50_STATE_H__
-
-#include "pipe/p_state.h"
-
-
-#endif
diff --git a/src/mesa/pipe/nv50/nv50_surface.c b/src/mesa/pipe/nv50/nv50_surface.c
deleted file mode 100644
index cfb370da77..0000000000
--- a/src/mesa/pipe/nv50/nv50_surface.c
+++ /dev/null
@@ -1,74 +0,0 @@
-
-/**************************************************************************
- * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- * 
- **************************************************************************/
-
-#include "nv50_context.h"
-#include "pipe/p_defines.h"
-#include "pipe/p_util.h"
-#include "pipe/p_winsys.h"
-#include "pipe/p_inlines.h"
-#include "pipe/util/p_tile.h"
-
-static struct pipe_surface *
-nv50_get_tex_surface(struct pipe_context *pipe,
-                     struct pipe_texture *pt,
-                     unsigned face, unsigned level, unsigned zslice)
-{
-	NOUVEAU_ERR("unimplemented\n");
-	return NULL;
-}
-
-static void
-nv50_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, struct pipe_surface *src,
-		  unsigned srcx, unsigned srcy, unsigned width, unsigned height)
-{
-	struct nv50_context *nv50 = (struct nv50_context *)pipe;
-	struct nouveau_winsys *nvws = nv50->nvws;
-
-	nvws->surface_copy(nvws, dest, destx, desty, src, srcx, srcy,
-			   width, height);
-}
-
-static void
-nv50_surface_fill(struct pipe_context *pipe, struct pipe_surface *dest,
-		  unsigned destx, unsigned desty, unsigned width,
-		  unsigned height, unsigned value)
-{
-	struct nv50_context *nv50 = (struct nv50_context *)pipe;
-	struct nouveau_winsys *nvws = nv50->nvws;
-
-	nvws->surface_fill(nvws, dest, destx, desty, width, height, value);
-}
-
-void
-nv50_init_surface_functions(struct nv50_context *nv50)
-{
-   nv50->pipe.get_tex_surface = nv50_get_tex_surface;
-   nv50->pipe.surface_copy = nv50_surface_copy;
-   nv50->pipe.surface_fill = nv50_surface_fill;
-}
diff --git a/src/mesa/pipe/nv50/nv50_vbo.c b/src/mesa/pipe/nv50/nv50_vbo.c
deleted file mode 100644
index 6c0dc23a43..0000000000
--- a/src/mesa/pipe/nv50/nv50_vbo.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "pipe/p_context.h"
-#include "pipe/p_state.h"
-#include "pipe/p_util.h"
-
-#include "nv50_context.h"
-#include "nv50_state.h"
-
-boolean
-nv50_draw_arrays(struct pipe_context *pipe, unsigned mode, unsigned start,
-		 unsigned count)
-{
-	NOUVEAU_ERR("unimplemented\n");
-	return TRUE;
-}
-
-boolean
-nv50_draw_elements(struct pipe_context *pipe,
-		   struct pipe_buffer *indexBuffer, unsigned indexSize,
-		   unsigned mode, unsigned start, unsigned count)
-{
-	NOUVEAU_ERR("unimplemented\n");
-	return TRUE;
-}
-