# HG changeset patch # User Shinji KONO # Date 1258228569 -32400 # Node ID c7b5c99252add3a60d300c636f9e89ab08603a90 # Parent f35a9bee38a67f9cdd33b65f4468f9ec14822d47 fix diff -r f35a9bee38a6 -r c7b5c99252ad Renderer/Engine/ChangeLog --- a/Renderer/Engine/ChangeLog Sun Nov 15 04:16:35 2009 +0900 +++ b/Renderer/Engine/ChangeLog Sun Nov 15 04:56:09 2009 +0900 @@ -1,3 +1,18 @@ +2009-11-15 Shinji Kono + + DrawSpan は， + Start DrawSpan region (allocate Z buffer) + DrawSpan / for each SpanPack + add_inData + End DrawSpan region (Write frame buffer,free Z buffer) + add_outData + みたいにしたい． + + CreateSpan は，SpanPack を入れ換えているようだが， + SpanPack は，ランダムに書きだし， + PPU 側で，それをsortする． + と言う方がよい? ほぼ毎回入れ換えているんじゃないの? + 2009-11-14 Shinji Kono DrawSpan の dma_write を追放。なんでこんなになっていたかは謎。 diff -r f35a9bee38a6 -r c7b5c99252ad Renderer/Engine/spe/CreatePolygon.cc --- a/Renderer/Engine/spe/CreatePolygon.cc Sun Nov 15 04:16:35 2009 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,196 +0,0 @@ -/** - * SceneGraph が増えてくると動かなくなるかもしれない。 - * 一応 mainMem とかで動くようになるとは思うけど。 - * だめだったら、そこら辺が怪しいと思うべき - */ - -// #define DEBUG -#include "error.h" - -#include "CreatePolygon.h" -#include "polygon_pack.h" -#include "scene_graph_pack.h" - -SchedDefineTask(CreatePolygon); - -#define SG_PACK_LOAD 10 -#define SG_NODE_LOAD 11 -#define PP_LOAD 12 -#define PP_STORE 13 - -/** - * あとで直す - */ -static void -rotate(float *xyz, float *matrix) -{ - float abc[4]; - - abc[0] = xyz[0]; - abc[1] = xyz[1]; - abc[2] = xyz[2]; - abc[3] = xyz[3]; - - for(int i=0; i<4; i++) - { - xyz[i] = abc[0]*matrix[i] + abc[1]*matrix[i+4] + abc[2]*matrix[i+8] + abc[3]*matrix[i+12]; - } -} - -static int -run(SchedTask *smanager,void *rbuf, void *wbuf) -{ - smanager->__debug_spe("CreatePolygon\n"); - - float xyz1[4],xyz2[4],xyz3[4]; - - SceneGraphPackPtr sgp = (SceneGraphPack*)smanager->get_input(0); - SceneGraphPackPtr next_sgp = - (SceneGraphPackPtr)smanager->allocate(sizeof(SceneGraphPack)); - SceneGraphPackPtr free_sgp = next_sgp; - SceneGraphPackPtr tmp_sgp; - - SceneGraphNodePtr node; - SceneGraphNodePtr next_node - = (SceneGraphNodePtr)smanager->allocate(sizeof(SceneGraphNode)); - SceneGraphNodePtr free_node = next_node; - SceneGraphNodePtr tmp_node; - - PolygonPackPtr pp - = (PolygonPackPtr)smanager->allocate(sizeof(PolygonPack)); - PolygonPackPtr send_pp - = (PolygonPackPtr)smanager->allocate(sizeof(PolygonPack)); - PolygonPackPtr pp_addr = (PolygonPackPtr)smanager->get_param(0); - PolygonPackPtr tmp_pp; - - pp->init(); - send_pp->init(); - - do { - if (sgp->next != NULL) { - smanager->dma_load(next_sgp, (uint32)sgp->next, - sizeof(SceneGraphPack), SG_PACK_LOAD); - } else { - next_sgp = NULL; - } - - for (int i = 0; i < sgp->info.size; i++) { - node = &sgp->node[i]; - - do { - if (node->next != NULL) { - smanager->dma_load(next_node, (uint32)node->next, - sizeof(SceneGraphNode), SG_NODE_LOAD); - } else { - next_node = NULL; - } - - for (int n = 0, nt = 0; n < node->size*3; n+=9, nt+=6) { - - if (pp->info.size >= MAX_SIZE_TRIANGLE) { - PolygonPackPtr next; - - // smanager から Task を作る、0 ではなく PolygonPack->task_id が良い - smanager->mainMem_alloc(0, sizeof(PolygonPack)); - smanager->mainMem_wait(); - next = (PolygonPackPtr)smanager->mainMem_get(0); - - pp->next = next; // この部分は TaskManager 側でやるべき - - tmp_pp = pp; - pp = send_pp; - send_pp = tmp_pp; - - smanager->dma_wait(PP_STORE); - smanager->dma_store(send_pp, (uint32)pp_addr, - sizeof(PolygonPack), PP_STORE); - - pp_addr = next; - - smanager->dma_wait(PP_LOAD); // 多分不要 - smanager->dma_load(pp, (uint32)pp_addr, - sizeof(PolygonPack), PP_LOAD); - // 次の dma_wait のコストが高いのでパイプラインで隠す必要がある - - smanager->dma_wait(PP_LOAD); - pp->init(); - - } - - TrianglePack *triangle = &pp->tri[pp->info.size++]; - - xyz1[0] = node->vertex[n]; - xyz1[1] = node->vertex[n+1]; - xyz1[2] = node->vertex[n+2]*-1; - xyz1[3] = 1; - xyz2[0] = node->vertex[n+3]; - xyz2[1] = node->vertex[n+3+1]; - xyz2[2] = node->vertex[n+3+2]*-1; - xyz2[3] = 1; - xyz3[0] = node->vertex[n+6]; - xyz3[1] = node->vertex[n+6+1]; - xyz3[2] = node->vertex[n+6+2]*-1; - xyz3[3] = 1; - - rotate(xyz1, node->translation); - rotate(xyz2, node->translation); - rotate(xyz3, node->translation); - - triangle->ver1.x = xyz1[0]; - triangle->ver1.y = xyz1[1]; - triangle->ver1.z = xyz1[2]; - triangle->ver1.tex_x = node->texture[nt]; - triangle->ver1.tex_y = node->texture[nt+1]; - - triangle->ver2.x = xyz2[0]; - triangle->ver2.y = xyz2[1]; - triangle->ver2.z = xyz2[2]; - triangle->ver2.tex_x = node->texture[nt+2]; - triangle->ver2.tex_y = node->texture[nt+2+1]; - - triangle->ver3.x = xyz3[0]; - triangle->ver3.y = xyz3[1]; - triangle->ver3.z = xyz3[2]; - triangle->ver3.tex_x = node->texture[nt+4]; - triangle->ver3.tex_y = node->texture[nt+4+1]; - -#if 1 - triangle->tex_info.addr = node->tex_addr; - triangle->tex_info.width = node->tex_width; - triangle->tex_info.height = node->tex_height; -#else - triangle->tex_info.addr = node->texture_info.pixels; - triangle->tex_info.width = node->texture_info.t_w; - triangle->tex_info.height = node->texture_info.t_h; -#endif - } - - smanager->dma_wait(SG_NODE_LOAD); - - tmp_node = node; - node = next_node; - next_node = tmp_node; - } while (node); - - next_node = free_node; - } - - smanager->dma_wait(SG_PACK_LOAD); - - tmp_sgp = sgp; - sgp = next_sgp; - next_sgp = tmp_sgp; - } while (sgp); - - smanager->dma_wait(PP_STORE); - smanager->dma_store(pp, (uint32)pp_addr, - sizeof(PolygonPack), PP_STORE); - smanager->dma_wait(PP_STORE); - - free(pp); - free(send_pp); - free(free_node); - free(free_sgp); - - return 0; -} diff -r f35a9bee38a6 -r c7b5c99252ad Renderer/Engine/spe/CreatePolygon.h --- a/Renderer/Engine/spe/CreatePolygon.h Sun Nov 15 04:16:35 2009 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef INCLUDED_CREATE_POLYGON -#define INCLUDED_CREATE_POLYGON - -#include "SchedTask.h" - - -#endif diff -r f35a9bee38a6 -r c7b5c99252ad Renderer/Engine/spe/spe-main.cc --- a/Renderer/Engine/spe/spe-main.cc Sun Nov 15 04:16:35 2009 +0900 +++ b/Renderer/Engine/spe/spe-main.cc Sun Nov 15 04:56:09 2009 +0900 @@ -12,7 +12,7 @@ SchedExternTask(ChainInit); SchedExternTask(CreateSpan); -//SchedExternTask(CreatePolygon); +//SchedExternTask(CreatePolygonFromSceneGraph); SchedExternTask(ShowTime); @@ -25,17 +25,13 @@ SchedRegister( LoadTexture); SchedRegister( SetTexture); SchedRegister( DrawSpan); - // SchedRegister( DrawSpanEnd); SchedRegister( ChainCal); SchedRegister( ChainInit); -#if 0 - SchedRegister( DrawSpanRenew); -#endif SchedRegister( DrawBack); SchedRegister( CreateSpan); - //SchedRegister( CreatePolygon); + //SchedRegister( CreatePolygonFromSceneGraph); SchedRegister( ShowTime); diff -r f35a9bee38a6 -r c7b5c99252ad Renderer/Engine/task/CreatePolygon.cc --- a/Renderer/Engine/task/CreatePolygon.cc Sun Nov 15 04:16:35 2009 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,188 +0,0 @@ -/** - * SceneGraph が増えてくると動かなくなるかもしれない。 - * 一応 mainMem とかで動くようになるとは思うけど。 - * だめだったら、そこら辺が怪しいと思うべき - */ - -#include "CreatePolygon.h" -#include "polygon_pack.h" -#include "scene_graph_pack.h" - -SchedDefineTask(CreatePolygon); - -#define SG_PACK_LOAD 10 -#define SG_NODE_LOAD 11 -#define PP_LOAD 12 -#define PP_STORE 13 - -/** - * あとで直す - */ -static void -rotate(float *xyz, float *matrix) -{ - float abc[4]; - - abc[0] = xyz[0]; - abc[1] = xyz[1]; - abc[2] = xyz[2]; - abc[3] = xyz[3]; - - for(int i=0; i<4; i++) - { - xyz[i] = abc[0]*matrix[i] + abc[1]*matrix[i+4] + abc[2]*matrix[i+8] + abc[3]*matrix[i+12]; - } -} - -static int -run(SchedTask *smanager, void *rbuf, void *wbuf) -{ - float xyz1[4],xyz2[4],xyz3[4]; - - SceneGraphPackPtr sgp = (SceneGraphPack*)smanager->get_input(0); - SceneGraphPackPtr next_sgp = - (SceneGraphPackPtr)smanager->allocate(sizeof(SceneGraphPack)); - SceneGraphPackPtr free_sgp = next_sgp; - SceneGraphPackPtr tmp_sgp; - - SceneGraphNodePtr node; - SceneGraphNodePtr next_node - = (SceneGraphNodePtr)smanager->allocate(sizeof(SceneGraphNode)); - SceneGraphNodePtr free_node = next_node; - SceneGraphNodePtr tmp_node; - - PolygonPackPtr pp - = (PolygonPackPtr)smanager->allocate(sizeof(PolygonPack)); - PolygonPackPtr send_pp - = (PolygonPackPtr)smanager->allocate(sizeof(PolygonPack)); - PolygonPackPtr pp_addr = (PolygonPackPtr)smanager->get_param(0); - PolygonPackPtr tmp_pp; - - pp->init(); - send_pp->init(); - - do { - if (sgp->next != NULL) { - smanager->dma_load(next_sgp, (memaddr)sgp->next, - sizeof(SceneGraphPack), SG_PACK_LOAD); - } else { - next_sgp = NULL; - } - - for (int i = 0; i < sgp->info.size; i++) { - node = &sgp->node[i]; - - do { - if (node->next != NULL) { - smanager->dma_load(next_node, (memaddr)node->next, - sizeof(SceneGraphNode), SG_NODE_LOAD); - } else { - next_node = NULL; - } - - for (int n = 0, nt = 0; n < node->size*3; n+=9, nt+=6) { - - if (pp->info.size >= MAX_SIZE_TRIANGLE) { - PolygonPackPtr next; - - smanager->mainMem_alloc(0, sizeof(PolygonPack)); - smanager->mainMem_wait(); - next = (PolygonPackPtr)smanager->mainMem_get(0); - - pp->next = next; - - tmp_pp = pp; - pp = send_pp; - send_pp = tmp_pp; - - smanager->dma_wait(PP_STORE); - smanager->dma_store(send_pp, (memaddr)pp_addr, - sizeof(PolygonPack), PP_STORE); - - pp_addr = next; - - smanager->dma_wait(PP_LOAD); - smanager->dma_load(pp, (memaddr)pp_addr, - sizeof(PolygonPack), PP_LOAD); - smanager->dma_wait(PP_LOAD); - pp->init(); - - } - - TrianglePack *triangle = &pp->tri[pp->info.size++]; - - xyz1[0] = node->vertex[n]; - xyz1[1] = node->vertex[n+1]; - xyz1[2] = node->vertex[n+2]*-1; - xyz1[3] = 1; - xyz2[0] = node->vertex[n+3]; - xyz2[1] = node->vertex[n+3+1]; - xyz2[2] = node->vertex[n+3+2]*-1; - xyz2[3] = 1; - xyz3[0] = node->vertex[n+6]; - xyz3[1] = node->vertex[n+6+1]; - xyz3[2] = node->vertex[n+6+2]*-1; - xyz3[3] = 1; - - rotate(xyz1, node->translation); - rotate(xyz2, node->translation); - rotate(xyz3, node->translation); - - triangle->ver1.x = xyz1[0]; - triangle->ver1.y = xyz1[1]; - triangle->ver1.z = xyz1[2]; - triangle->ver1.tex_x = node->texture[nt]; - triangle->ver1.tex_y = node->texture[nt+1]; - - triangle->ver2.x = xyz2[0]; - triangle->ver2.y = xyz2[1]; - triangle->ver2.z = xyz2[2]; - triangle->ver2.tex_x = node->texture[nt+2]; - triangle->ver2.tex_y = node->texture[nt+2+1]; - - triangle->ver3.x = xyz3[0]; - triangle->ver3.y = xyz3[1]; - triangle->ver3.z = xyz3[2]; - triangle->ver3.tex_x = node->texture[nt+4]; - triangle->ver3.tex_y = node->texture[nt+4+1]; - -#if 1 - triangle->tex_info.addr = node->tex_addr; - triangle->tex_info.width = node->tex_width; - triangle->tex_info.height = node->tex_height; -#else - triangle->tex_info.addr = node->texture_info.pixels; - triangle->tex_info.width = node->texture_info.t_w; - triangle->tex_info.height = node->texture_info.t_h; -#endif - } - - smanager->dma_wait(SG_NODE_LOAD); - - tmp_node = node; - node = next_node; - next_node = tmp_node; - } while (node); - - next_node = free_node; - } - - smanager->dma_wait(SG_PACK_LOAD); - - tmp_sgp = sgp; - sgp = next_sgp; - next_sgp = tmp_sgp; - } while (sgp); - - smanager->dma_wait(PP_STORE); - smanager->dma_store(pp, (memaddr)pp_addr, - sizeof(PolygonPack), PP_STORE); - smanager->dma_wait(PP_STORE); - - free(pp); - free(send_pp); - free(free_node); - free(free_sgp); - - return 0; -} diff -r f35a9bee38a6 -r c7b5c99252ad Renderer/Engine/task/CreatePolygon.h --- a/Renderer/Engine/task/CreatePolygon.h Sun Nov 15 04:16:35 2009 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef INCLUDED_CREATE_POLYGON -#define INCLUDED_CREATE_POLYGON - -#include "SchedTask.h" - - -#endif diff -r f35a9bee38a6 -r c7b5c99252ad Renderer/Engine/task/task_init.cc --- a/Renderer/Engine/task/task_init.cc Sun Nov 15 04:16:35 2009 +0900 +++ b/Renderer/Engine/task/task_init.cc Sun Nov 15 04:56:09 2009 +0900 @@ -3,7 +3,6 @@ SchedExternTask(Create_SGP); SchedExternTask(Update_SGP); -SchedExternTask(CreatePolygon); SchedExternTask(CreatePolygonFromSceneGraph); SchedExternTask(CreateSpan); @@ -37,7 +36,6 @@ { SchedRegister( Create_SGP); SchedRegister( Update_SGP); - SchedRegister( CreatePolygon); SchedRegister(CreatePolygonFromSceneGraph); SchedRegister( CreateSpan);