summaryrefslogtreecommitdiff
path: root/src/mesa/pipe
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-12-23 16:06:24 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-12-23 16:17:22 +1100
commitfa605cf661c09c5866cd9aa316b6a5ce9eb65c24 (patch)
treea04345536e625884f4d7944533903970840a1314 /src/mesa/pipe
parentb4b002661e8a1f9a37201796c996503c33b8c96f (diff)
nouveau: some cleanups
Diffstat (limited to 'src/mesa/pipe')
-rw-r--r--src/mesa/pipe/nouveau/nouveau_channel.h2
-rw-r--r--src/mesa/pipe/nouveau/nouveau_pushbuf.h32
2 files changed, 34 insertions, 0 deletions
diff --git a/src/mesa/pipe/nouveau/nouveau_channel.h b/src/mesa/pipe/nouveau/nouveau_channel.h
index eccc7b3bd4..b99de9add8 100644
--- a/src/mesa/pipe/nouveau/nouveau_channel.h
+++ b/src/mesa/pipe/nouveau/nouveau_channel.h
@@ -27,6 +27,8 @@ struct nouveau_channel {
struct nouveau_device *device;
int id;
+ struct nouveau_pushbuf *pushbuf;
+
struct nouveau_grobj *vram;
struct nouveau_grobj *gart;
diff --git a/src/mesa/pipe/nouveau/nouveau_pushbuf.h b/src/mesa/pipe/nouveau/nouveau_pushbuf.h
new file mode 100644
index 0000000000..1909765098
--- /dev/null
+++ b/src/mesa/pipe/nouveau/nouveau_pushbuf.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2007 Nouveau Project
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef __NOUVEAU_PUSHBUF_H__
+#define __NOUVEAU_PUSHBUF_H__
+
+struct nouveau_pushbuf {
+ struct nouveau_channel *channel;
+ unsigned remaining;
+ uint32_t *cur;
+};
+
+#endif