diff options
| author | Younes Manton <[email protected]> | 2009-12-06 16:44:11 -0500 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2009-12-06 16:44:11 -0500 |
| commit | 447dddb93d8dc2551ef7a9c43004237c7a8dd2dd (patch) | |
| tree | de18c6e4c2b071923345bcc1fa876459c4148a70 /src/gallium/winsys/g3dvl | |
| parent | 9e8ab2e7c1b8ff5279d4247b8690c9bfc57f7e02 (diff) | |
| parent | c574f515f0aa20ccc3841cf61a6124bc5996e7b2 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_shader_build.c
Diffstat (limited to 'src/gallium/winsys/g3dvl')
| -rw-r--r-- | src/gallium/winsys/g3dvl/xlib/xsp_winsys.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c index 2b32f07c9e8..8553efabe9e 100644 --- a/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c +++ b/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c @@ -143,13 +143,10 @@ static struct pipe_buffer* xsp_surface_buffer_create ) { const unsigned int ALIGNMENT = 1; - struct pipe_format_block block; - unsigned nblocksx, nblocksy; + unsigned nblocksy; - pf_get_block(format, &block); - nblocksx = pf_get_nblocksx(&block, width); - nblocksy = pf_get_nblocksy(&block, height); - *stride = align(nblocksx * block.size, ALIGNMENT); + nblocksy = pf_get_nblocksy(format, height); + *stride = align(pf_get_stride(format, width), ALIGNMENT); return pws->buffer_create(pws, ALIGNMENT, usage, *stride * nblocksy); |