mesa: Use u_math.h from macros.h

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_bufferobj.h

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h
index fccc349b836615a161fcb1eecd89ee2fe2c06369..01ef0bad0fd4a6b45d292577125a8253e26e38e9 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.h
@@ -1,27 +1,46 @@
+/*
+ * Copyright (C) 2009 Francisco Jerez.
+ * All Rights Reserved.
+ *
+ * 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 (including the
+ * next paragraph) 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 COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS 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_BUFFEROBJ_H__
 #define __NOUVEAU_BUFFEROBJ_H__
 
-#include "mtypes.h"
-#include "nouveau_buffers.h"
-
-typedef struct nouveau_buffer_object_t {
-       /* Base class, must be first */
-       struct gl_buffer_object mesa;
-
-       /* Memory used for GPU access to the buffer*/
-       nouveau_mem *           gpu_mem;
-       /* Buffer has been dirtied by the GPU */
-       GLboolean               gpu_dirty;
+struct nouveau_bufferobj {
+       struct gl_buffer_object base;
+       struct nouveau_bo *bo;
+       void *sys;
+};
+#define to_nouveau_bufferobj(x) ((struct nouveau_bufferobj *)(x))
 
-       /* Memory used for CPU access to the buffer */
-       nouveau_mem *           cpu_mem;
-       /* Buffer has possibly been dirtied by the CPU */
-       GLboolean               cpu_dirty;
-} nouveau_buffer_object;
+#define nouveau_bufferobj_hw(x) \
+       (_mesa_is_bufferobj(x) ? to_nouveau_bufferobj(x)->bo : NULL)
 
-extern uint32_t nouveau_bufferobj_gpu_ref(GLcontext *ctx, GLenum access,
-                                         struct gl_buffer_object *obj);
+#define nouveau_bufferobj_sys(x) \
+       (_mesa_is_bufferobj(x) ? to_nouveau_bufferobj(x)->sys : NULL)
 
-extern void nouveauInitBufferObjects(GLcontext *ctx);
+void
+nouveau_bufferobj_functions_init(struct dd_function_table *functions);
 
 #endif