projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch'
[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 c888ca071c8d621fbccea8d5d7055092df35e064..61e24a5b571746e3b5b9c2af0fb76ff4398b2a2e 100644
(file)
--- a/
src/gallium/drivers/nv50/nv50_screen.h
+++ b/
src/gallium/drivers/nv50/nv50_screen.h
@@
-1,10
+1,10
@@
#ifndef __NV50_SCREEN_H__
#define __NV50_SCREEN_H__
#ifndef __NV50_SCREEN_H__
#define __NV50_SCREEN_H__
-#include "
pipe/p
_screen.h"
+#include "
nouveau/nouveau
_screen.h"
struct nv50_screen {
struct nv50_screen {
- struct
pipe_screen pip
e;
+ struct
nouveau_screen bas
e;
struct nouveau_winsys *nvws;
struct nouveau_winsys *nvws;
@@
-12,13
+12,17
@@
struct nv50_screen {
struct nouveau_grobj *tesla;
struct nouveau_grobj *eng2d;
struct nouveau_grobj *tesla;
struct nouveau_grobj *eng2d;
+ struct nouveau_grobj *m2mf;
struct nouveau_notifier *sync;
struct nouveau_notifier *sync;
- struct
pipe_buffer *constbuf
;
- struct nouveau_
resource *vp_data_heap
;
+ struct
nouveau_bo *constbuf_misc[1]
;
+ struct nouveau_
bo *constbuf_parm[2]
;
- struct pipe_buffer *tic;
- struct pipe_buffer *tsc;
+ struct nouveau_resource *immd_heap[1];
+ struct nouveau_resource *parm_heap[2];
+
+ struct nouveau_bo *tic;
+ struct nouveau_bo *tsc;
struct nouveau_stateobj *static_init;
};
struct nouveau_stateobj *static_init;
};
@@
-29,6
+33,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 *);
+void nv50_
transfer
_init_screen_functions(struct pipe_screen *);
#endif
#endif