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

Merge branch 'gallium-0.1' of ssh://ymanton@git.freedesktop.org/git/nouveau/mesa into gallium-0.1

Browse source
This commit is contained in:
Younes Manton 2008-06-08 20:24:13 -04:00
commit d785a0c8b2
2 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/winsys/dri/nouveau/nouveau_context.c
View file

@ -99,7 +99,7 @@ nouveau_context_create(const __GLcontextModes *glVis,
struct st_context *st_share = NULL;
struct nouveau_channel_context *nvc = NULL;
struct nouveau_device *dev = nv_screen->device;
int i, ret;
int i;
if (sharedContextPrivate) {
st_share = ((struct nouveau_context *)sharedContextPrivate)->st;

23
src/gallium/winsys/dri/nouveau/nouveau_winsys_pipe.c
View file

@ -39,28 +39,6 @@ nouveau_surface_alloc(struct pipe_winsys *ws)
return surf;
}
static int
nouveau_surface_alloc_storage(struct pipe_winsys *ws, struct pipe_surface *surf,
unsigned width, unsigned height,
enum pipe_format format, unsigned flags,
unsigned tex_usage)
{
unsigned pitch = ((width * pf_get_size(format)) + 63) & ~63;
surf->format = format;
surf->width = width;
surf->height = height;
surf->cpp = pf_get_size(format);
surf->pitch = pitch / surf->cpp;
surf->buffer = ws->buffer_create(ws, 256, PIPE_BUFFER_USAGE_PIXEL,
pitch * height);
if (!surf->buffer)
return 1;
return 0;
}
static void
nouveau_surface_release(struct pipe_winsys *ws, struct pipe_surface **s)
{
@ -226,7 +204,6 @@ nouveau_create_pipe_winsys(struct nouveau_context *nv)
pws->flush_frontbuffer = nouveau_flush_frontbuffer;
pws->surface_alloc = nouveau_surface_alloc;
pws->surface_alloc_storage = nouveau_surface_alloc_storage;
pws->surface_release = nouveau_surface_release;
pws->buffer_create = nouveau_pipe_bo_create;