projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svga: adapt to stencil ref changes
[mesa.git]
/
src
/
gallium
/
drivers
/
nv30
/
nv30_context.c
diff --git
a/src/gallium/drivers/nv30/nv30_context.c
b/src/gallium/drivers/nv30/nv30_context.c
index 38b39159f1950a964882b1c7a78a069a4ccef739..8bfd7b2c9095bf9c8dfcee533c164007da9ecdb3 100644
(file)
--- a/
src/gallium/drivers/nv30/nv30_context.c
+++ b/
src/gallium/drivers/nv30/nv30_context.c
@@
-1,6
+1,6
@@
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
-#include "
pipe/internal/p_winsys
_screen.h"
+#include "
util/u_simple
_screen.h"
#include "nv30_context.h"
#include "nv30_screen.h"
#include "nv30_context.h"
#include "nv30_screen.h"
@@
-10,15
+10,20
@@
nv30_flush(struct pipe_context *pipe, unsigned flags,
struct pipe_fence_handle **fence)
{
struct nv30_context *nv30 = nv30_context(pipe);
struct pipe_fence_handle **fence)
{
struct nv30_context *nv30 = nv30_context(pipe);
+ struct nv30_screen *screen = nv30->screen;
+ struct nouveau_channel *chan = screen->base.channel;
+ struct nouveau_grobj *rankine = screen->rankine;
if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
if (flags & PIPE_FLUSH_TEXTURE_CACHE) {
- BEGIN_RING(rankine, 0x1fd8, 1);
- OUT_RING (2);
- BEGIN_RING(rankine, 0x1fd8, 1);
- OUT_RING (1);
+ BEGIN_RING(
chan,
rankine, 0x1fd8, 1);
+ OUT_RING (
chan,
2);
+ BEGIN_RING(
chan,
rankine, 0x1fd8, 1);
+ OUT_RING (
chan,
1);
}
}
- FIRE_RING(fence);
+ FIRE_RING(chan);
+ if (fence)
+ *fence = NULL;
}
static void
}
static void
@@
-38,7
+43,7
@@
nv30_destroy(struct pipe_context *pipe)
}
struct pipe_context *
}
struct pipe_context *
-nv30_create(struct pipe_screen *pscreen,
unsigned pctx_id
)
+nv30_create(struct pipe_screen *pscreen,
void *priv
)
{
struct nv30_screen *screen = nv30_screen(pscreen);
struct pipe_winsys *ws = pscreen->winsys;
{
struct nv30_screen *screen = nv30_screen(pscreen);
struct pipe_winsys *ws = pscreen->winsys;
@@
-49,12
+54,12
@@
nv30_create(struct pipe_screen *pscreen, unsigned pctx_id)
if (!nv30)
return NULL;
nv30->screen = screen;
if (!nv30)
return NULL;
nv30->screen = screen;
- nv30->pctx_id = pctx_id;
nv30->nvws = nvws;
nv30->pipe.winsys = ws;
nv30->pipe.screen = pscreen;
nv30->nvws = nvws;
nv30->pipe.winsys = ws;
nv30->pipe.screen = pscreen;
+ nv30->pipe.priv = priv;
nv30->pipe.destroy = nv30_destroy;
nv30->pipe.draw_arrays = nv30_draw_arrays;
nv30->pipe.draw_elements = nv30_draw_elements;
nv30->pipe.destroy = nv30_destroy;
nv30->pipe.draw_arrays = nv30_draw_arrays;
nv30->pipe.draw_elements = nv30_draw_elements;