summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/sw
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsapountzis@gmail.com>2010-03-28 19:30:03 +0300
committerGeorge Sapountzis <gsapountzis@gmail.com>2010-03-28 19:30:54 +0300
commita24fc90703f62d286031cb2ee8f625ef728243fd (patch)
tree5772b573c75440f065636b27045029dcea4fd197 /src/gallium/winsys/sw
parentc42fe8cd278fdff831f557bbfcbfde16bd38a65d (diff)
drisw: probably better hack for stride and some comments
Diffstat (limited to 'src/gallium/winsys/sw')
-rw-r--r--src/gallium/winsys/sw/dri/dri_sw_winsys.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/gallium/winsys/sw/dri/dri_sw_winsys.c b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
index ee8ec91bc52..1c1e5612d28 100644
--- a/src/gallium/winsys/sw/dri/dri_sw_winsys.c
+++ b/src/gallium/winsys/sw/dri/dri_sw_winsys.c
@@ -62,15 +62,6 @@ xm_is_displaytarget_format_supported( struct sw_winsys *ws,
return TRUE;
}
-/* see bytes_per_line in libGL */
-static INLINE int
-bytes_per_line(unsigned pitch_bits, unsigned mul)
-{
- unsigned mask = mul - 1;
-
- return ((pitch_bits + mask) & ~mask) / 8;
-}
-
/* pipe_screen::texture_create DISPLAY_TARGET / SCANOUT / SHARED */
static struct sw_displaytarget *
xm_displaytarget_create(struct sw_winsys *winsys,
@@ -81,7 +72,7 @@ xm_displaytarget_create(struct sw_winsys *winsys,
unsigned *stride)
{
struct xm_displaytarget *xm_dt;
- unsigned nblocksy, size, xm_stride, loader_stride, format_stride;
+ unsigned nblocksy, size, xm_stride, format_stride;
xm_dt = CALLOC_STRUCT(xm_displaytarget);
if(!xm_dt)
@@ -89,27 +80,15 @@ xm_displaytarget_create(struct sw_winsys *winsys,
format_stride = util_format_get_stride(format, width);
xm_stride = align(format_stride, alignment);
- loader_stride = bytes_per_line(format_stride * 8, 32);
nblocksy = util_format_get_nblocksy(format, height);
size = xm_stride * nblocksy;
-#ifdef DEBUG
- debug_printf("swrast format stride: %8d\n", format_stride);
- debug_printf("swrast pipe stride : %8d\n", xm_stride);
- debug_printf("swrast loader stride: %8d\n", loader_stride);
-#endif
-
- /*
- * Allocate with the aligned stride required by the pipe but set the stride
- * to the one hardcoded in the loaders XXX
- */
-
xm_dt->data = align_malloc(size, alignment);
if(!xm_dt->data)
goto no_data;
- *stride = loader_stride;
+ *stride = xm_stride;
return (struct sw_displaytarget *)xm_dt;
no_data: