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/7.8'
[mesa.git]
/
src
/
gallium
/
drivers
/
i915
/
i915_batch.h
diff --git
a/src/gallium/drivers/i915/i915_batch.h
b/src/gallium/drivers/i915/i915_batch.h
index b813784723fc7d00e096a28fbd2a81421b388f32..f0086695d16f5cde235c71885f0c8d1885574d4b 100644
(file)
--- a/
src/gallium/drivers/i915/i915_batch.h
+++ b/
src/gallium/drivers/i915/i915_batch.h
@@
-28,19
+28,19
@@
#ifndef I915_BATCH_H
#define I915_BATCH_H
#ifndef I915_BATCH_H
#define I915_BATCH_H
-#include "i
ntel
_batchbuffer.h"
+#include "i
915
_batchbuffer.h"
#define BEGIN_BATCH(dwords, relocs) \
#define BEGIN_BATCH(dwords, relocs) \
- (i
ntel
_batchbuffer_check(i915->batch, dwords, relocs))
+ (i
915_winsys
_batchbuffer_check(i915->batch, dwords, relocs))
#define OUT_BATCH(dword) \
#define OUT_BATCH(dword) \
- i
ntel
_batchbuffer_dword(i915->batch, dword)
+ i
915_winsys
_batchbuffer_dword(i915->batch, dword)
#define OUT_RELOC(buf, usage, offset) \
#define OUT_RELOC(buf, usage, offset) \
- i
ntel
_batchbuffer_reloc(i915->batch, buf, usage, offset)
+ i
915_winsys
_batchbuffer_reloc(i915->batch, buf, usage, offset)
#define FLUSH_BATCH(fence) do { \
#define FLUSH_BATCH(fence) do { \
- i
ntel
_batchbuffer_flush(i915->batch, fence); \
+ i
915_winsys
_batchbuffer_flush(i915->batch, fence); \
i915->hardware_dirty = ~0; \
} while (0)
i915->hardware_dirty = ~0; \
} while (0)