projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
drivers
/
i915
/
i915_buffer.c
diff --git
a/src/gallium/drivers/i915/i915_buffer.c
b/src/gallium/drivers/i915/i915_buffer.c
index 669964770d41fc6bf7857d917741cba958b41c0b..1247de320d456d7ef171a0f61032583ca86d84a8 100644
(file)
--- a/
src/gallium/drivers/i915/i915_buffer.c
+++ b/
src/gallium/drivers/i915/i915_buffer.c
@@
-23,17
+23,18
@@
*
**************************************************************************/
*
**************************************************************************/
+#include "util/u_inlines.h"
#include "util/u_memory.h"
#include "i915_screen.h"
#include "i915_buffer.h"
#include "util/u_memory.h"
#include "i915_screen.h"
#include "i915_buffer.h"
-struct i
ntel
_buffer;
+struct i
915_winsys
_buffer;
struct i915_buffer
{
struct pipe_buffer base;
struct i915_buffer
{
struct pipe_buffer base;
- struct i
ntel
_buffer *ibuf; /** hw buffer */
+ struct i
915_winsys
_buffer *ibuf; /** hw buffer */
void *data; /**< user and malloc data */
boolean own; /**< we own the data incase of malloc */
void *data; /**< user and malloc data */
boolean own; /**< we own the data incase of malloc */