projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gallium-texture-transfer
[mesa.git]
/
src
/
gallium
/
drivers
/
nv50
/
nv50_screen.h
diff --git
a/src/gallium/drivers/nv50/nv50_screen.h
b/src/gallium/drivers/nv50/nv50_screen.h
index 6e4120d6693435308240ff309bb5a72ca6410097..c888ca071c8d621fbccea8d5d7055092df35e064 100644
(file)
--- a/
src/gallium/drivers/nv50/nv50_screen.h
+++ b/
src/gallium/drivers/nv50/nv50_screen.h
@@
-7,12
+7,20
@@
struct nv50_screen {
struct pipe_screen pipe;
struct nouveau_winsys *nvws;
struct pipe_screen pipe;
struct nouveau_winsys *nvws;
- unsigned chipset;
unsigned cur_pctx;
struct nouveau_grobj *tesla;
unsigned cur_pctx;
struct nouveau_grobj *tesla;
+ struct nouveau_grobj *eng2d;
struct nouveau_notifier *sync;
struct nouveau_notifier *sync;
+
+ struct pipe_buffer *constbuf;
+ struct nouveau_resource *vp_data_heap;
+
+ struct pipe_buffer *tic;
+ struct pipe_buffer *tsc;
+
+ struct nouveau_stateobj *static_init;
};
static INLINE struct nv50_screen *
};
static INLINE struct nv50_screen *
@@
-21,4
+29,6
@@
nv50_screen(struct pipe_screen *screen)
return (struct nv50_screen *)screen;
}
return (struct nv50_screen *)screen;
}
+void nv50_surface_init_screen_functions(struct pipe_screen *);
+
#endif
#endif