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

nouveau: fix build

Browse source
This commit is contained in:
Ben Skeggs 2008-02-22 12:36:48 +11:00
parent f7922db610
commit 73e0e567de
3 changed files with 39 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/default
View file

@ -70,7 +70,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
# Gallium directories and
GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util
GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv30 nv40 nv50 failover
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = xlib

38
src/gallium/drivers/nv40/nv40_miptree.c
View file

@ -63,6 +63,7 @@ nv40_miptree_create(struct pipe_context *pipe, const struct pipe_texture *pt)
if (!mt)
return NULL;
mt->base = *pt;
mt->base.refcount = 1;
nv40_miptree_layout(mt);
mt->buffer = ws->buffer_create(ws, 256, PIPE_BUFFER_USAGE_PIXEL,
@ -95,10 +96,47 @@ nv40_miptree_release(struct pipe_context *pipe, struct pipe_texture **pt)
}
}
static void
nv40_miptree_update(struct pipe_context *pipe, struct pipe_texture *mt)
{
}
static struct pipe_surface *
nv40_miptree_surface(struct pipe_context *pipe, struct pipe_texture *pt,
unsigned face, unsigned level, unsigned zslice)
{
struct pipe_winsys *ws = pipe->winsys;
struct nv40_miptree *nv40mt = (struct nv40_miptree *)pt;
struct pipe_surface *ps;
ps = ws->surface_alloc(ws);
if (!ps)
return NULL;
pipe_buffer_reference(ws, &ps->buffer, nv40mt->buffer);
ps->format = pt->format;
ps->cpp = pt->cpp;
ps->width = pt->width[level];
ps->height = pt->height[level];
ps->pitch = nv40mt->level[level].pitch / ps->cpp;
if (pt->target == PIPE_TEXTURE_CUBE) {
ps->offset = nv40mt->level[level].image_offset[face];
} else
if (pt->target == PIPE_TEXTURE_3D) {
ps->offset = nv40mt->level[level].image_offset[zslice];
} else {
ps->offset = nv40mt->level[level].image_offset[0];
}
return ps;
}
void
nv40_init_miptree_functions(struct nv40_context *nv40)
{
nv40->pipe.texture_create = nv40_miptree_create;
nv40->pipe.texture_release = nv40_miptree_release;
nv40->pipe.texture_update = nv40_miptree_update;
nv40->pipe.get_tex_surface = nv40_miptree_surface;
}

31
src/gallium/drivers/nv40/nv40_surface.c
View file

@ -73,36 +73,6 @@ nv40_surface_format_supported(struct pipe_context *pipe,
return FALSE;
}
static struct pipe_surface *
nv40_get_tex_surface(struct pipe_context *pipe, struct pipe_texture *pt,
unsigned face, unsigned level, unsigned zslice)
{
struct pipe_winsys *ws = pipe->winsys;
struct nv40_miptree *nv40mt = (struct nv40_miptree *)pt;
struct pipe_surface *ps;
ps = ws->surface_alloc(ws);
if (!ps)
return NULL;
pipe_buffer_reference(ws, &ps->buffer, nv40mt->buffer);
ps->format = pt->format;
ps->cpp = pt->cpp;
ps->width = pt->width[level];
ps->height = pt->height[level];
ps->pitch = nv40mt->level[level].pitch / ps->cpp;
if (pt->target == PIPE_TEXTURE_CUBE) {
ps->offset = nv40mt->level[level].image_offset[face];
} else
if (pt->target == PIPE_TEXTURE_3D) {
ps->offset = nv40mt->level[level].image_offset[zslice];
} else {
ps->offset = nv40mt->level[level].image_offset[0];
}
return ps;
}
static void
nv40_surface_copy(struct pipe_context *pipe, unsigned do_flip,
struct pipe_surface *dest, unsigned destx, unsigned desty,
@ -131,7 +101,6 @@ void
nv40_init_surface_functions(struct nv40_context *nv40)
{
nv40->pipe.is_format_supported = nv40_surface_format_supported;
nv40->pipe.get_tex_surface = nv40_get_tex_surface;
nv40->pipe.surface_copy = nv40_surface_copy;
nv40->pipe.surface_fill = nv40_surface_fill;
}