fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-24 10:20:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge commit 'origin/master' into gallium-map-range

Browse source
This commit is contained in:
José Fonseca 2009-03-04 16:44:31 +00:00
commit 67cbe83a72
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/cell/ppu/cell_state_shader.c
View file

@ -193,9 +193,7 @@ cell_set_constant_buffer(struct pipe_context *pipe,
draw_flush(cell->draw);
/* note: reference counting */
pipe_buffer_reference(pipe->screen,
&cell->constants[shader].buffer,
buf->buffer);
pipe_buffer_reference(&cell->constants[shader].buffer, buf->buffer);
if (shader == PIPE_SHADER_VERTEX)
cell->dirty |= CELL_NEW_VS_CONSTANTS;

5
src/gallium/drivers/cell/ppu/cell_texture.c
View file

@ -129,7 +129,7 @@ cell_texture_destroy(struct pipe_texture *pt)
struct cell_texture *ct = cell_texture(pt);
if (ct->mapped) {
pipe_buffer_unmap(screen, ct->buffer);
pipe_buffer_unmap(ct->buffer->screen, ct->buffer);
ct->mapped = NULL;
}
@ -308,7 +308,7 @@ cell_get_tex_surface(struct pipe_screen *screen,
static void
cell_tex_surface_destroy(struct pipe_surface *s)
cell_tex_surface_destroy(struct pipe_surface *surf)
{
pipe_texture_reference(&surf->texture, NULL);
FREE(surf);
@ -336,7 +336,6 @@ cell_get_tex_transfer(struct pipe_screen *screen,
ctrans = CALLOC_STRUCT(cell_transfer);
if (ctrans) {
struct pipe_transfer *pt = &ctrans->base;
pipe_reference_init(&pt->reference, 1);
pipe_texture_reference(&pt->texture, texture);
pt->format = texture->format;
pt->block = texture->block;

15
src/gallium/winsys/xlib/xlib_cell.c
View file

@ -107,22 +107,21 @@ xm_buffer_unmap(struct pipe_winsys *pws, struct pipe_buffer *buf)
}
static void
xm_buffer_destroy(struct pipe_winsys *pws,
xm_buffer_destroy(/*struct pipe_winsys *pws,*/
struct pipe_buffer *buf)
{
struct xm_buffer *oldBuf = xm_buffer(buf);
if (oldBuf->data) {
{
if (oldBuf) {
if (oldBuf->data) {
if (!oldBuf->userBuffer) {
align_free(oldBuf->data);
}
oldBuf->data = NULL;
}
oldBuf->data = NULL;
free(oldBuf);
}
free(oldBuf);
}
@ -371,7 +370,7 @@ xlib_create_cell_winsys( void )
static struct pipe_screen *
xlib_create_cell_screen( struct pipe_winsys *pws )
xlib_create_cell_screen( void )
{
struct pipe_winsys *winsys;
struct pipe_screen *screen;