#ifndef _NINE_BUFFER9_H_
#define _NINE_BUFFER9_H_
+#include "device9.h"
+#include "nine_buffer_upload.h"
+#include "nine_state.h"
#include "resource9.h"
+#include "pipe/p_context.h"
+#include "pipe/p_state.h"
+#include "util/list.h"
struct pipe_screen;
struct pipe_context;
struct pipe_transfer;
+struct NineTransfer {
+ struct pipe_transfer *transfer;
+ bool is_pipe_secondary;
+ struct nine_subbuffer *buf; /* NULL unless subbuffer are used */
+ bool should_destroy_buf; /* If the subbuffer should be destroyed */
+};
+
struct NineBuffer9
{
struct NineResource9 base;
/* G3D */
- struct pipe_context *pipe;
- struct pipe_transfer **maps;
+ struct NineTransfer *maps;
int nmaps, maxmaps;
UINT size;
+
+ int16_t bind_count; /* to Device9->state.stream */
+ /* Whether only discard and nooverwrite were used so far
+ * for this buffer. Allows some optimization. */
+ boolean discard_nooverwrite_only;
+ struct nine_subbuffer *buf;
+
+ /* Specific to managed buffers */
+ struct {
+ void *data;
+ boolean dirty;
+ struct pipe_box dirty_box;
+ struct list_head list; /* for update_buffers */
+ struct list_head list2; /* for managed_buffers */
+ unsigned pending_upload; /* for uploads */
+ } managed;
};
static inline struct NineBuffer9 *
NineBuffer9( void *data )
NineBuffer9_dtor( struct NineBuffer9 *This );
struct pipe_resource *
-NineBuffer9_GetResource( struct NineBuffer9 *This );
+NineBuffer9_GetResource( struct NineBuffer9 *This, unsigned *offset );
-HRESULT WINAPI
+HRESULT NINE_WINAPI
NineBuffer9_Lock( struct NineBuffer9 *This,
UINT OffsetToLock,
UINT SizeToLock,
void **ppbData,
DWORD Flags );
-HRESULT WINAPI
+HRESULT NINE_WINAPI
NineBuffer9_Unlock( struct NineBuffer9 *This );
+static inline void
+NineBuffer9_Upload( struct NineBuffer9 *This )
+{
+ struct NineDevice9 *device = This->base.base.device;
+
+ assert(This->base.pool == D3DPOOL_MANAGED && This->managed.dirty);
+ nine_context_range_upload(device, &This->managed.pending_upload, This->base.resource,
+ This->managed.dirty_box.x,
+ This->managed.dirty_box.width,
+ (char *)This->managed.data + This->managed.dirty_box.x);
+ This->managed.dirty = FALSE;
+}
+
+static void inline
+NineBindBufferToDevice( struct NineDevice9 *device,
+ struct NineBuffer9 **slot,
+ struct NineBuffer9 *buf )
+{
+ struct NineBuffer9 *old = *slot;
+
+ if (buf) {
+ if ((buf->managed.dirty) && LIST_IS_EMPTY(&buf->managed.list))
+ list_add(&buf->managed.list, &device->update_buffers);
+ buf->bind_count++;
+ }
+ if (old)
+ old->bind_count--;
+
+ nine_bind(slot, buf);
+}
+
+void
+NineBuffer9_SetDirty( struct NineBuffer9 *This );
+
+#define BASEBUF_REGISTER_UPDATE(b) { \
+ if ((b)->managed.dirty && (b)->bind_count) \
+ if (LIST_IS_EMPTY(&(b)->managed.list)) \
+ list_add(&(b)->managed.list, &(b)->base.base.device->update_buffers); \
+ }
+
#endif /* _NINE_BUFFER9_H_ */