fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 10:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nv40: fix valgrind complaints

Browse source
This commit is contained in:
Ben Skeggs 2007-12-17 21:49:16 +11:00
parent 8043d2d261
commit c5ffd8e9af
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/pipe/nv40/nv40_fragprog.c
View file

@ -124,6 +124,7 @@ emit_src(struct nv40_fpc *fpc, int pos, struct nv40_sreg src)
fpd = &fp->consts[fp->nr_consts - 1];
fpd->offset = fpc->inst_offset + 4;
fpd->index = fpc->consts[src.index].pipe;
memset(&fp->insn[fpd->offset], 0, sizeof(uint32_t) * 4);
} else {
memcpy(&fp->insn[fpc->inst_offset + 4],
fpc->consts[src.index].vals,

9
src/mesa/pipe/nv40/nv40_miptree.c
View file

@ -55,17 +55,14 @@ nv40_miptree_layout(struct nv40_miptree *nv40mt)
static void
nv40_miptree_create(struct pipe_context *pipe, struct pipe_texture **pt)
{
struct pipe_texture *mt = *pt;
struct pipe_winsys *ws = pipe->winsys;
struct nv40_miptree *nv40mt;
*pt = NULL;
nv40mt = calloc(1, sizeof(struct nv40_miptree));
nv40mt = realloc(*pt, sizeof(struct nv40_miptree));
if (!nv40mt)
return;
*pt = NULL;
memcpy(&nv40mt->base, mt, sizeof(struct pipe_texture));
nv40_miptree_layout(nv40mt);
nv40mt->buffer = ws->buffer_create(ws, 256, 0, 0);
@ -91,7 +88,7 @@ nv40_miptree_release(struct pipe_context *pipe, struct pipe_texture **pt)
int l;
ws->buffer_reference(ws, &nv40mt->buffer, NULL);
for (l = 0; l < PIPE_MAX_TEXTURE_LEVELS; l++) {
for (l = mt->first_level; l <= mt->last_level; l++) {
if (nv40mt->level[l].image_offset)
free(nv40mt->level[l].image_offset);
}