projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into radeon-rewrite
[mesa.git]
/
src
/
gallium
/
winsys
/
xlib
/
xlib_brw_screen.c
diff --git
a/src/gallium/winsys/xlib/xlib_brw_screen.c
b/src/gallium/winsys/xlib/xlib_brw_screen.c
index 8e1bfab2f5607e6c2828a26af8fff622a9021b6d..fe8dfff767209d610ed4d478924337c86abd105a 100644
(file)
--- a/
src/gallium/winsys/xlib/xlib_brw_screen.c
+++ b/
src/gallium/winsys/xlib/xlib_brw_screen.c
@@
-37,7
+37,6
@@
//#include "state_trackers/xlib/xmesaP.h"
#include "pipe/internal/p_winsys_screen.h"
//#include "state_trackers/xlib/xmesaP.h"
#include "pipe/internal/p_winsys_screen.h"
-#include "pipe/p_inlines.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "i965simple/brw_winsys.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "i965simple/brw_winsys.h"
@@
-57,10
+56,10
@@
buffer_from_surface(struct pipe_surface *surface)
}
struct aub_buffer {
}
struct aub_buffer {
+ struct pipe_reference reference;
char *data;
unsigned offset;
unsigned size;
char *data;
unsigned offset;
unsigned size;
- unsigned refcount;
unsigned map_count;
boolean dump_on_unmap;
};
unsigned map_count;
boolean dump_on_unmap;
};
@@
-144,8
+143,7
@@
static void aub_buffer_unmap(struct pipe_winsys *winsys,
static void
static void
-aub_buffer_destroy(struct pipe_winsys *winsys,
- struct pipe_buffer *buf)
+aub_buffer_destroy(struct pipe_buffer *buf)
{
free(buf);
}
{
free(buf);
}
@@
-189,7
+187,7
@@
aub_buffer_create(struct pipe_winsys *winsys,
struct aub_pipe_winsys *iws = aub_pipe_winsys(winsys);
struct aub_buffer *sbo = CALLOC_STRUCT(aub_buffer);
struct aub_pipe_winsys *iws = aub_pipe_winsys(winsys);
struct aub_buffer *sbo = CALLOC_STRUCT(aub_buffer);
-
sbo->refcount = 1
;
+
pipe_reference_init(&sbo->reference, 1)
;
/* Could reuse buffers that are not referenced in current
* batchbuffer. Can't do that atm, so always reallocate:
/* Could reuse buffers that are not referenced in current
* batchbuffer. Can't do that atm, so always reallocate: