projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DRI2: check for swapAvailable before using swap interval protocol
[mesa.git]
/
src
/
gallium
/
drivers
/
nv40
/
nv40_screen.h
diff --git
a/src/gallium/drivers/nv40/nv40_screen.h
b/src/gallium/drivers/nv40/nv40_screen.h
index c04a1275a004c1f6ca3f6fb5a1ac0a46da96f9e6..9437aa050d40db7a62a9bf0a8c98819c65289f6e 100644
(file)
--- a/
src/gallium/drivers/nv40/nv40_screen.h
+++ b/
src/gallium/drivers/nv40/nv40_screen.h
@@
-1,16
+1,18
@@
#ifndef __NV40_SCREEN_H__
#define __NV40_SCREEN_H__
#ifndef __NV40_SCREEN_H__
#define __NV40_SCREEN_H__
-#include "pipe/p_screen.h"
+#include "nouveau/nouveau_screen.h"
+#include "nouveau/nv04_surface_2d.h"
struct nv40_screen {
struct nv40_screen {
- struct
pipe_screen pip
e;
+ struct
nouveau_screen bas
e;
struct nouveau_winsys *nvws;
struct nouveau_winsys *nvws;
-
unsigned cur_p
ctx;
+
struct nv40_context *cur_
ctx;
/* HW graphics objects */
/* HW graphics objects */
+ struct nv04_surface_2d *eng2d;
struct nouveau_grobj *curie;
struct nouveau_notifier *sync;
struct nouveau_grobj *curie;
struct nouveau_notifier *sync;
@@
-32,4
+34,7
@@
nv40_screen(struct pipe_screen *screen)
return (struct nv40_screen *)screen;
}
return (struct nv40_screen *)screen;
}
+void
+nv40_screen_init_transfer_functions(struct pipe_screen *pscreen);
+
#endif
#endif