projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Add assert to check input to strcmp.
[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 54572e9ab3a893f55ca81bf4c17541e3e2892545..279b74445cab824bfa2aa4d26bc6c5bb7c0e90cc 100644
(file)
--- a/
src/gallium/drivers/nv30/nv30_context.c
+++ b/
src/gallium/drivers/nv30/nv30_context.c
@@
-1,6
+1,5
@@
#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 "nv30_context.h"
#include "nv30_screen.h"
#include "nv30_context.h"
#include "nv30_screen.h"
@@
-43,7
+42,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;
@@
-54,12
+53,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;