fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-14 00:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

intel: fix _mesa_error ctx I introduced at lsat minute

Browse source
This commit is contained in:
Dave Airlie 2008-04-16 16:37:13 +10:00
parent 7cc7ff7051
commit 96338dd147
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/mesa/drivers/dri/i915/i830_vtbl.c
View file

@ -25,6 +25,7 @@
*
**************************************************************************/
#include "glapi.h"
#include "i830_context.h"
#include "i830_reg.h"
@ -418,8 +419,9 @@ i830_emit_state(struct intel_context *intel)
{
struct i830_context *i830 = i830_context(&intel->ctx);
struct i830_hw_state *state = i830->current;
int i;
int i, ret, count;
GLuint dirty;
GET_CURRENT_CONTEXT(ctx);
BATCH_LOCALS;
/* We don't hold the lock at this point, so want to make sure that
@ -435,6 +437,34 @@ i830_emit_state(struct intel_context *intel)
*/
intel_batchbuffer_require_space(intel->batch, get_state_size(state) + 8,
LOOP_CLIPRECTS);
count = 0;
again:
dirty = get_dirty(state);
ret = 0;
if (dirty & I830_UPLOAD_BUFFERS) {
ret |= dri_bufmgr_check_aperture_space(state->draw_region->buffer);
ret |= dri_bufmgr_check_aperture_space(state->depth_region->buffer);
}
for (i = 0; i < I830_TEX_UNITS; i++)
if (dirty & I830_UPLOAD_TEX(i)) {
if (state->tex_buffer[i]) {
ret |= dri_bufmgr_check_aperture_space(state->tex_buffer[i]);
}
}
if (ret) {
if (count == 0) {
count++;
intel_batchbuffer_flush(intel->batch);
goto again;
} else {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "i830 emit state");
assert(0);
}
}
/* Do this here as we may have flushed the batchbuffer above,
* causing more state to be dirty!

3
src/mesa/drivers/dri/i915/i915_vtbl.c
View file

@ -43,6 +43,8 @@
#include "i915_reg.h"
#include "i915_context.h"
#include "glapi.h"
static void
i915_render_prevalidate(struct intel_context *intel)
{
@ -297,6 +299,7 @@ i915_emit_state(struct intel_context *intel)
int i;
int ret, count;
GLuint dirty;
GET_CURRENT_CONTEXT(ctx);
BATCH_LOCALS;
/* We don't hold the lock at this point, so want to make sure that