X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fnvfx%2Fnvfx_context.c;h=36209cb1792f4cff38b7858ba34508d0c701fda4;hb=bf8daf1c0af0befb6b40ddeca4b24fd676363874;hp=2f775f92cf5b68e7ae181887b1285b8ddba0041a;hpb=bfaa2577c6474222c79341c0d90685ed579f3414;p=mesa.git

diff --git a/src/gallium/drivers/nvfx/nvfx_context.c b/src/gallium/drivers/nvfx/nvfx_context.c
index 2f775f92cf5..36209cb1792 100644
--- a/src/gallium/drivers/nvfx/nvfx_context.c
+++ b/src/gallium/drivers/nvfx/nvfx_context.c
@@ -1,31 +1,46 @@
 #include "draw/draw_context.h"
 #include "pipe/p_defines.h"
 #include "util/u_framebuffer.h"
+#include "vl/vl_decoder.h"
+#include "vl/vl_video_buffer.h"
 
 #include "nvfx_context.h"
 #include "nvfx_screen.h"
 #include "nvfx_resource.h"
 
 static void
-nvfx_flush(struct pipe_context *pipe, unsigned flags,
+nvfx_flush(struct pipe_context *pipe,
 	   struct pipe_fence_handle **fence)
 {
 	struct nvfx_context *nvfx = nvfx_context(pipe);
 	struct nvfx_screen *screen = nvfx->screen;
 	struct nouveau_channel *chan = screen->base.channel;
-	struct nouveau_grobj *eng3d = screen->eng3d;
+	/*struct nouveau_grobj *eng3d = screen->eng3d;*/
 
 	/* XXX: we need to actually be intelligent here */
-	if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
+        /* XXX This flag wasn't set by the state tracker anyway. */
+        /*if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
 		BEGIN_RING(chan, eng3d, 0x1fd8, 1);
-		OUT_RING  (chan, 2);
+		OUT_RING(chan, 2);
 		BEGIN_RING(chan, eng3d, 0x1fd8, 1);
-		OUT_RING  (chan, 1);
-	}
-
-	FIRE_RING(chan);
-	if (fence)
+		OUT_RING(chan, 1);
+        }*/
+
+	if (fence) {
+		/* horrific hack to make glFinish() work in the absence of
+		 * having proper fences in nvfx.  a pending rewrite will
+		 * fix this properly, but may be a while off.
+		 */
+		MARK_RING(chan, 1, 1);
+		OUT_RELOC(chan, screen->fence, 0, NOUVEAU_BO_WR |
+				NOUVEAU_BO_DUMMY, 0, 0);
+		FIRE_RING(chan);
+		nouveau_bo_map(screen->fence, NOUVEAU_BO_RDWR);
+		nouveau_bo_unmap(screen->fence);
 		*fence = NULL;
+	} else {
+		FIRE_RING(chan);
+	}
 }
 
 static void
@@ -46,6 +61,9 @@ nvfx_destroy(struct pipe_context *pipe)
 	if (nvfx->draw)
 		draw_destroy(nvfx->draw);
 
+	if(nvfx->screen->cur_ctx == nvfx)
+		nvfx->screen->cur_ctx = NULL;
+
 	FREE(nvfx);
 }
 
@@ -53,18 +71,13 @@ struct pipe_context *
 nvfx_create(struct pipe_screen *pscreen, void *priv)
 {
 	struct nvfx_screen *screen = nvfx_screen(pscreen);
-	struct pipe_winsys *ws = pscreen->winsys;
 	struct nvfx_context *nvfx;
-	struct nouveau_winsys *nvws = screen->nvws;
 
 	nvfx = CALLOC(1, sizeof(struct nvfx_context));
 	if (!nvfx)
 		return NULL;
 	nvfx->screen = screen;
 
-	nvfx->nvws = nvws;
-
-	nvfx->pipe.winsys = ws;
 	nvfx->pipe.screen = pscreen;
 	nvfx->pipe.priv = priv;
 	nvfx->pipe.destroy = nvfx_destroy;
@@ -72,9 +85,8 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
 	nvfx->pipe.clear = nvfx_clear;
 	nvfx->pipe.flush = nvfx_flush;
 
-	screen->base.channel->user_private = nvfx;
-
 	nvfx->is_nv4x = screen->is_nv4x;
+	nvfx->use_nv4x = screen->use_nv4x;
 	/* TODO: it seems that nv30 might have fixed function clipping usable with vertex programs
 	 * However, my code for that doesn't work, so use vp clipping for all cards, which works.
 	 */
@@ -103,8 +115,10 @@ nvfx_create(struct pipe_screen *pscreen, void *priv)
 	nvfx->hw_pointsprite_control = -1;
 	nvfx->hw_vp_output = -1;
 	nvfx->use_vertex_buffers = -1;
+	nvfx->relocs_needed = NVFX_RELOCATE_ALL;
 
 	LIST_INITHEAD(&nvfx->render_cache);
+	nvfx_context_init_vdec(nvfx);
 
 	return &nvfx->pipe;
 }