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

i965: fix vb aperture space check

This commit is contained in:
Dave Airlie 2008-04-18 15:14:48 +10:00
parent e92e3848e7
commit fda4895d26
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/drivers/dri/i965/brw_draw_upload.c
View File

@ -315,7 +315,7 @@ int brw_prepare_vertices( struct brw_context *brw,
GLuint i; GLuint i;
const unsigned char *ptr = NULL; const unsigned char *ptr = NULL;
GLuint interleave = 0; GLuint interleave = 0;
int ret; int ret = 0;
struct brw_vertex_element *enabled[VERT_ATTRIB_MAX]; struct brw_vertex_element *enabled[VERT_ATTRIB_MAX];
GLuint nr_enabled = 0; GLuint nr_enabled = 0;
@ -362,6 +362,8 @@ int brw_prepare_vertices( struct brw_context *brw,
dri_bo_reference(input->bo); dri_bo_reference(input->bo);
input->offset = (unsigned long)input->glarray->Ptr; input->offset = (unsigned long)input->glarray->Ptr;
input->stride = input->glarray->StrideB; input->stride = input->glarray->StrideB;
ret |= dri_bufmgr_check_aperture_space(input->bo);
} else { } else {
/* Queue the buffer object up to be uploaded in the next pass, /* Queue the buffer object up to be uploaded in the next pass,
* when we've decided if we're doing interleaved or not. * when we've decided if we're doing interleaved or not.
@ -419,11 +421,13 @@ int brw_prepare_vertices( struct brw_context *brw,
} }
if (brw->vb.upload.bo) { if (brw->vb.upload.bo) {
ret = dri_bufmgr_check_aperture_space(brw->vb.upload.bo); ret |= dri_bufmgr_check_aperture_space(brw->vb.upload.bo);
if (ret)
return 1;
} }
if (ret)
return 1;
return 0; return 0;
} }