fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radeon: fixup map/unmap texture to work with override BOs

Browse source 
if you hit this you've already failed but we shouldn't crash
This commit is contained in:
Dave Airlie 2009-03-25 17:01:37 +10:00
parent 4d36a19c90
commit 258686a973
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/mesa/drivers/dri/radeon/radeon_texture.c
View file

@ -131,6 +131,25 @@ void radeon_teximage_unmap(radeon_texture_image *image)
}
}
static void map_override(GLcontext *ctx, radeonTexObj *t)
{
radeon_texture_image *img = get_radeon_texture_image(t->base.Image[0][0]);
radeon_bo_map(t->bo, GL_FALSE);
img->base.Data = t->bo->ptr;
_mesa_set_fetch_functions(&img->base, 2);
}
static void unmap_override(GLcontext *ctx, radeonTexObj *t)
{
radeon_texture_image *img = get_radeon_texture_image(t->base.Image[0][0]);
radeon_bo_unmap(t->bo);
img->base.Data = NULL;
}
/**
* Map a validated texture for reading during software rendering.
*/
@ -143,8 +162,11 @@ void radeonMapTexture(GLcontext *ctx, struct gl_texture_object *texObj)
return;
/* for r100 3D sw fallbacks don't have mt */
if (t->image_override && t->bo)
map_override(ctx, t);
if (!t->mt)
return;
return;
radeon_bo_map(t->mt->bo, GL_FALSE);
for(face = 0; face < t->mt->faces; ++face) {
@ -158,6 +180,8 @@ void radeonUnmapTexture(GLcontext *ctx, struct gl_texture_object *texObj)
radeonTexObj* t = radeon_tex_obj(texObj);
int face, level;
if (t->image_override && t->bo)
unmap_override(ctx, t);
/* for r100 3D sw fallbacks don't have mt */
if (!t->mt)
return;