nouveau: adapt

Some things that worked before are now broken, there's an "XXX:" around one
of the culprits in the GL state tracker so hopefully it'll get fixed soon!

3 files changed, 36 insertions, 37 deletions

diff --git a/src/mesa/pipe/nv50/nv50_context.c b/src/mesa/pipe/nv50/nv50_context.c
index 25ead1b564..ed12c6c0d9 100644
--- a/src/mesa/pipe/nv50/nv50_context.c
+++ b/src/mesa/pipe/nv50/nv50_context.c
@@ -7,16 +7,9 @@
 #include "nv50_dma.h"
 
 static boolean
-nv50_is_format_supported(struct pipe_context *pipe, uint format)
+nv50_is_format_supported(struct pipe_context *pipe, enum pipe_format format,
+			 uint type)
 {
-	switch (format) {
-	case PIPE_FORMAT_A8R8G8B8_UNORM:
-	case PIPE_FORMAT_Z24S8_UNORM:
-		return TRUE;
-	default:
-		break;
-	};
-
 	return FALSE;
 }
 
diff --git a/src/mesa/pipe/nv50/nv50_query.c b/src/mesa/pipe/nv50/nv50_query.c
index 51cf6804d7..69eb0e700b 100644
--- a/src/mesa/pipe/nv50/nv50_query.c
+++ b/src/mesa/pipe/nv50/nv50_query.c
@@ -3,28 +3,46 @@
 #include "nv50_context.h"
 #include "nv50_dma.h"
 
+static struct pipe_query *
+nv50_query_create(struct pipe_context *pipe, unsigned type)
+{
+	NOUVEAU_ERR("unimplemented\n");
+	return NULL;
+}
+
 static void
-nv50_query_begin(struct pipe_context *pipe, struct pipe_query_object *q)
+nv50_query_destroy(struct pipe_context *pipe, struct pipe_query *q)
 {
 	NOUVEAU_ERR("unimplemented\n");
 }
 
 static void
-nv50_query_end(struct pipe_context *pipe, struct pipe_query_object *q)
+nv50_query_begin(struct pipe_context *pipe, struct pipe_query *q)
 {
 	NOUVEAU_ERR("unimplemented\n");
 }
 
 static void
-nv50_query_wait(struct pipe_context *pipe, struct pipe_query_object *q)
+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_t *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.wait_query = nv50_query_wait;
+	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
index 778b9f5c9a..0a27a4676e 100644
--- a/src/mesa/pipe/nv50/nv50_state.c
+++ b/src/mesa/pipe/nv50/nv50_state.c
@@ -10,6 +10,7 @@ static void *
 nv50_alpha_test_state_create(struct pipe_context *pipe,
 			     const struct pipe_alpha_test_state *cso)
 {
+	return NULL;
 }
 
 static void
@@ -26,6 +27,7 @@ static void *
 nv50_blend_state_create(struct pipe_context *pipe,
 			const struct pipe_blend_state *cso)
 {
+	return NULL;
 }
 
 static void
@@ -42,6 +44,7 @@ static void *
 nv50_sampler_state_create(struct pipe_context *pipe,
 			  const struct pipe_sampler_state *cso)
 {
+	return NULL;
 }
 
 static void
@@ -55,10 +58,17 @@ 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
@@ -75,6 +85,7 @@ static void *
 nv50_depth_stencil_state_create(struct pipe_context *pipe,
 				const struct pipe_depth_stencil_state *cso)
 {
+	return NULL;
 }
 
 static void
@@ -132,12 +143,6 @@ nv50_set_clip_state(struct pipe_context *pipe,
 }
 
 static void
-nv50_set_clear_color_state(struct pipe_context *pipe,
-			   const struct pipe_clear_color_state *ccol)
-{
-}
-
-static void
 nv50_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
 			 const struct pipe_constant_buffer *buf )
 {
@@ -156,24 +161,12 @@ nv50_set_polygon_stipple(struct pipe_context *pipe,
 }
 
 static void
-nv50_set_sampler_units(struct pipe_context *pipe,
-		       uint num_samplers, const uint *units)
-{
-}
-
-static void
 nv50_set_scissor_state(struct pipe_context *pipe,
 		       const struct pipe_scissor_state *s)
 {
 }
 
 static void
-nv50_set_texture_state(struct pipe_context *pipe, unsigned unit,
-		       struct pipe_texture *pt)
-{
-}
-
-static void
 nv50_set_viewport_state(struct pipe_context *pipe,
 			const struct pipe_viewport_state *vpt)
 {
@@ -205,6 +198,7 @@ nv50_init_state_functions(struct nv50_context *nv50)
 	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;
@@ -224,19 +218,13 @@ nv50_init_state_functions(struct nv50_context *nv50)
 
 	nv50->pipe.set_blend_color = nv50_set_blend_color;
 	nv50->pipe.set_clip_state = nv50_set_clip_state;
-	nv50->pipe.set_clear_color_state = nv50_set_clear_color_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_sampler_units = nv50_set_sampler_units;
 	nv50->pipe.set_scissor_state = nv50_set_scissor_state;
-	nv50->pipe.set_texture_state = nv50_set_texture_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;
-
-//	nv50->pipe.set_feedback_state = nv50_set_feedback_state;
-//	nv50->pipe.set_feedback_buffer = nv50_set_feedback_buffer;
 }