diff options
| author | michal <michal@michal-laptop.(none)> | 2007-07-27 10:05:40 +0200 |
|---|---|---|
| committer | michal <michal@michal-laptop.(none)> | 2007-07-27 10:05:40 +0200 |
| commit | e0a26b046764ae80748b347395ab1b27de83651e (patch) | |
| tree | ea702756a3e9cedc3b3c41241cbff0956ddc82bc /src/mesa/drivers/dri/i915tex | |
| parent | 0360b49afbcd839f99ba0745d01cf9dc5be4d122 (diff) | |
| parent | e3cef5887540016a6d198598cb50bebe09e3f4cf (diff) | |
Merge branch 'master' of git+ssh://michal@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/drivers/dri/i915tex')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_batchbuffer.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_fbo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h index 59261f7274..212f130101 100644 --- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h @@ -9,7 +9,7 @@ struct intel_context; #define BATCH_SZ 16384 #define BATCH_RESERVED 16 -#define MAX_RELOCS 400 +#define MAX_RELOCS 4096 #define INTEL_BATCH_NO_CLIPRECTS 0x1 #define INTEL_BATCH_CLIPRECTS 0x2 diff --git a/src/mesa/drivers/dri/i915tex/intel_fbo.c b/src/mesa/drivers/dri/i915tex/intel_fbo.c index 2dd3617f93..a09db46163 100644 --- a/src/mesa/drivers/dri/i915tex/intel_fbo.c +++ b/src/mesa/drivers/dri/i915tex/intel_fbo.c @@ -509,7 +509,7 @@ intel_new_renderbuffer(GLcontext * ctx, GLuint name) */ static void intel_bind_framebuffer(GLcontext * ctx, GLenum target, - struct gl_framebuffer *fb) + struct gl_framebuffer *fb, struct gl_framebuffer *fbread) { if (target == GL_FRAMEBUFFER_EXT || target == GL_DRAW_FRAMEBUFFER_EXT) { intel_draw_buffer(ctx, fb); |