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_6_branch'
[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 4500aa0e5cc2ac1084620c1172eda15d0df3f268..57b4c8fc46cda9ca7f1be5cd8c798e9efeb2acff 100644
(file)
--- a/
src/gallium/drivers/nv40/nv40_screen.h
+++ b/
src/gallium/drivers/nv40/nv40_screen.h
@@
-1,11
+1,11
@@
#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 "nv04/nv04_surface_2d.h"
struct nv40_screen {
#include "nv04/nv04_surface_2d.h"
struct nv40_screen {
- struct
pipe_screen pip
e;
+ struct
nouveau_screen bas
e;
struct nouveau_winsys *nvws;
struct nouveau_winsys *nvws;
@@
-34,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