From 2a2d851212e73ee1881547d18964b09397cf7068 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Thu, 15 Dec 2005 08:46:27 +0000 Subject: [PATCH] fixed not asking cmd buffer for room for all items (scaled_fiterled_blit) git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15541 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c b/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c index f5ece2f893..589b91928b 100644 --- a/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c +++ b/src/add-ons/accelerants/nvidia/engine/nv_acc_dma.c @@ -1805,7 +1805,7 @@ void SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT_DMA(engine_token *et, scaled_blit_par if (si->ps.card_type != NV04) { /* wait for room in fifo for cmds if needed. */ - if (nv_acc_fifofree_dma(3) != B_OK) return; + if (nv_acc_fifofree_dma(5) != B_OK) return; /* now setup source bitmap colorspace */ nv_acc_cmd_dma(NV_SCALED_IMAGE_FROM_MEMORY, NV_SCALED_IMAGE_FROM_MEMORY_SETCOLORFORMAT, 2); ((uint32*)(si->dma_buffer))[si->engine.dma.current++] = cmd_depth; /* SetColorFormat */ @@ -1815,13 +1815,12 @@ void SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT_DMA(engine_token *et, scaled_blit_par else { /* wait for room in fifo for cmd if needed. */ - if (nv_acc_fifofree_dma(2) != B_OK) return; + if (nv_acc_fifofree_dma(4) != B_OK) return; /* now setup source bitmap colorspace */ nv_acc_cmd_dma(NV_SCALED_IMAGE_FROM_MEMORY, NV_SCALED_IMAGE_FROM_MEMORY_SETCOLORFORMAT, 1); ((uint32*)(si->dma_buffer))[si->engine.dma.current++] = cmd_depth; /* SetColorFormat */ /* TNT1 has fixed operation mode SRCcopy */ } - /* now setup fill color (writing 2 32bit words) */ nv_acc_cmd_dma(NV4_GDI_RECTANGLE_TEXT, NV4_GDI_RECTANGLE_TEXT_COLOR1A, 1); ((uint32*)(si->dma_buffer))[si->engine.dma.current++] = 0x00000000; /* Color1A */