AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i915: Fix compile on linux-dri-debug

Browse Source
This commit is contained in:
Jakob Bornecrantz
2008-06-03 12:35:01 +02:00
parent 6a3aab1983
commit afd635a950
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/i915simple/i915_batch.h
-2
View File
@@ -29,7 +29,6 @@
#define I915_BATCH_H
#include "i915_winsys.h"
#include "i915_debug.h"
struct i915_batchbuffer
{
@@ -110,7 +109,6 @@ i915_batchbuffer_flush( struct i915_batchbuffer *batch,
i915_batchbuffer_reloc( i915->batch, buf, flags, delta )
#define FLUSH_BATCH(fence) do { \
if (0) i915_dump_batchbuffer( i915 ); \
i915->winsys->batch_flush( i915->winsys, fence ); \
i915->hardware_dirty = ~0; \
} while (0)
src/gallium/drivers/i915simple/i915_blit.c
+1
View File
@@ -31,6 +31,7 @@
#include "i915_blit.h"
#include "i915_reg.h"
#include "i915_batch.h"
#include "i915_debug.h"
#define FILE_DEBUG_FLAG DEBUG_BLIT
src/gallium/winsys/dri/intel/intel_batchbuffer.h
+2 -2
View File
@@ -88,7 +88,7 @@ intel_batchbuffer_space(struct intel_batchbuffer *batch)
static INLINE void
intel_batchbuffer_emit_dword(struct intel_batchbuffer *batch, GLuint dword)
{
assert(batch->map);
assert(batch->base.map);
assert(intel_batchbuffer_space(batch) >= 4);
*(GLuint *) (batch->base.ptr) = dword;
batch->base.ptr += 4;
@@ -100,7 +100,7 @@ intel_batchbuffer_require_space(struct intel_batchbuffer *batch,
{
struct _DriFenceObject *fence;
assert(sz < batch->size - 8);
assert(sz < batch->base.size - 8);
if (intel_batchbuffer_space(batch) < sz ||
(batch->flags != 0 && flags != 0 && batch->flags != flags)) {
fence = intel_batchbuffer_flush(batch);