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

i915: Remade texture allocation code again

Browse source
This commit is contained in:
Jakob Bornecrantz 2008-05-30 13:31:42 +02:00
parent 9760ab2349
commit 2ade5268dc
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/i915simple/i915_texture.c
View file

@ -128,7 +128,7 @@ i915_displaytarget_layout(struct pipe_screen *screen,
{
struct pipe_texture *pt = &tex->base;
if (pt->last_level > 1 || pt->cpp != 4)
if (pt->last_level > 0 || pt->cpp != 4)
return 0;
i915_miptree_set_level_info( tex, 0, 1, 0, 0,
@ -177,7 +177,7 @@ i945_miptree_layout_2d( struct i915_texture *tex )
/* Pitch must be a whole number of dwords, even though we
* express it in texels.
*/
tex->pitch = align_int(tex->pitch * pt->cpp, 4) / pt->cpp;
tex->pitch = align_int(tex->pitch * pt->cpp, 64) / pt->cpp;
tex->total_height = 0;
for (level = 0; level <= pt->last_level; level++) {
@ -537,10 +537,7 @@ i915_texture_create(struct pipe_screen *screen,
tex->base.refcount = 1;
tex->base.screen = screen;
if (tex->base.tex_usage & PIPE_TEXTURE_USAGE_DISPLAY_TARGET) {
if (!i915_displaytarget_layout(screen, tex))
goto fail;
} else if (i915screen->is_i945) {
if (i915screen->is_i945) {
if (!i945_miptree_layout(tex))
goto fail;
} else {