projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-sampler-view
[mesa.git]
/
src
/
gallium
/
drivers
/
nv30
/
nv30_screen.h
diff --git
a/src/gallium/drivers/nv30/nv30_screen.h
b/src/gallium/drivers/nv30/nv30_screen.h
index 744a72de91a0cedf40fae9f251ba35ec480859fd..b7856cdf00541f9bfdc8c779f7f5f3fa0b94aaad 100644
(file)
--- a/
src/gallium/drivers/nv30/nv30_screen.h
+++ b/
src/gallium/drivers/nv30/nv30_screen.h
@@
-10,7
+10,7
@@
struct nv30_screen {
struct nouveau_winsys *nvws;
struct nouveau_winsys *nvws;
-
unsigned cur_p
ctx;
+
struct nv30_context *cur_
ctx;
/* HW graphics objects */
struct nv04_surface_2d *eng2d;
/* HW graphics objects */
struct nv04_surface_2d *eng2d;
@@
-35,7
+35,4
@@
nv30_screen(struct pipe_screen *screen)
return (struct nv30_screen *)screen;
}
return (struct nv30_screen *)screen;
}
-void
-nv30_screen_init_transfer_functions(struct pipe_screen *pscreen);
-
#endif
#endif