diff options
author | Michal Krol <michal@vmware.com> | 2009-12-17 23:41:57 +0100 |
---|---|---|
committer | Michal Krol <michal@vmware.com> | 2009-12-17 23:41:57 +0100 |
commit | b1ed72ebe2599ec178f51d86fd42f26486b9a19b (patch) | |
tree | b49428bb48d81bf1396ef14ee8a0a462f89d2d8e /src/gallium/winsys/gdi/gdi_softpipe_winsys.c | |
parent | ec5577a83da18890a4f334af2241aca41b6ed31b (diff) | |
download | external_mesa3d-b1ed72ebe2599ec178f51d86fd42f26486b9a19b.zip external_mesa3d-b1ed72ebe2599ec178f51d86fd42f26486b9a19b.tar.gz external_mesa3d-b1ed72ebe2599ec178f51d86fd42f26486b9a19b.tar.bz2 |
Move the remaining format pf_get_* functions to u_format.h.
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
Diffstat (limited to 'src/gallium/winsys/gdi/gdi_softpipe_winsys.c')
-rw-r--r-- | src/gallium/winsys/gdi/gdi_softpipe_winsys.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c index 40f612e..2ad794c 100644 --- a/src/gallium/winsys/gdi/gdi_softpipe_winsys.c +++ b/src/gallium/winsys/gdi/gdi_softpipe_winsys.c @@ -163,8 +163,8 @@ gdi_softpipe_surface_buffer_create(struct pipe_winsys *winsys, const unsigned alignment = 64; unsigned nblocksy; - nblocksy = pf_get_nblocksy(format, height); - *stride = align(pf_get_stride(format, width), alignment); + nblocksy = util_format_get_nblocksy(format, height); + *stride = align(util_format_get_stride(format, width), alignment); return winsys->buffer_create(winsys, alignment, usage, @@ -271,10 +271,10 @@ gdi_softpipe_present(struct pipe_screen *screen, memset(&bmi, 0, sizeof(BITMAPINFO)); bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi.bmiHeader.biWidth = texture->stride[surface->level] / util_format_get_size(surface->format); + bmi.bmiHeader.biWidth = texture->stride[surface->level] / util_format_get_blocksize(surface->format); bmi.bmiHeader.biHeight= -(long)surface->height; bmi.bmiHeader.biPlanes = 1; - bmi.bmiHeader.biBitCount = util_format_get_bits(surface->format); + bmi.bmiHeader.biBitCount = util_format_get_blocksizebits(surface->format); bmi.bmiHeader.biCompression = BI_RGB; bmi.bmiHeader.biSizeImage = 0; bmi.bmiHeader.biXPelsPerMeter = 0; |