projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
llvmpipe: delete lp_test_*.o files with make clean
[mesa.git]
/
src
/
gallium
/
drivers
/
nouveau
/
nouveau_screen.h
diff --git
a/src/gallium/drivers/nouveau/nouveau_screen.h
b/src/gallium/drivers/nouveau/nouveau_screen.h
index c0ec6e48952ce2f93b9c310eb5c5f41e3e023f83..8eacdff035815b64ebafcb7afe8521f86c9782be 100644
(file)
--- a/
src/gallium/drivers/nouveau/nouveau_screen.h
+++ b/
src/gallium/drivers/nouveau/nouveau_screen.h
@@
-1,10
+1,17
@@
#ifndef __NOUVEAU_SCREEN_H__
#define __NOUVEAU_SCREEN_H__
#ifndef __NOUVEAU_SCREEN_H__
#define __NOUVEAU_SCREEN_H__
+#include "pipe/p_screen.h"
+
struct nouveau_screen {
struct pipe_screen base;
struct nouveau_device *device;
struct nouveau_channel *channel;
struct nouveau_screen {
struct pipe_screen base;
struct nouveau_device *device;
struct nouveau_channel *channel;
+
+ /* note that OpenGL doesn't distinguish between these, so
+ * these almost always should be set to the same value */
+ unsigned vertex_buffer_flags;
+ unsigned index_buffer_flags;
};
static inline struct nouveau_screen *
};
static inline struct nouveau_screen *
@@
-60,4
+67,16
@@
void nouveau_screen_fini(struct nouveau_screen *);
+static __inline__ unsigned
+RING_3D(unsigned mthd, unsigned size)
+{
+ return (7 << 13) | (size << 18) | mthd;
+}
+
+static __inline__ unsigned
+RING_3D_NI(unsigned mthd, unsigned size)
+{
+ return 0x40000000 | (7 << 13) | (size << 18) | mthd;
+}
+
#endif
#endif