[R300-commit] r300_driver/r300 r300_cmdbuf.c,1.36,1.37 r300_context.c,1.14,1.15 r300_context.h,1.50,
Brought to you by:
volodya
Menu
▾
▴
[R300-commit] r300_driver/r300 r300_cmdbuf.c,1.36,1.37 r300_context.c,1.14,1.15 r300_context.h,1.50,1.51 r300_emit.h,1.9,1.10 r300_state.c,1.85,1.86 r300_vertexprog.c,1.14,1.15
|
From: Aapo T. <aa...@us...> - 2005-03-12 10:14:22
|
Update of /cvsroot/r300/r300_driver/r300 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5762 Modified Files: r300_cmdbuf.c r300_context.c r300_context.h r300_emit.h r300_state.c r300_vertexprog.c Log Message: Unlike radeon and r200 drivers r300AllocCmdBuf allocs dwords not bytes. Index: r300_vertexprog.c =================================================================== RCS file: /cvsroot/r300/r300_driver/r300/r300_vertexprog.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- r300_vertexprog.c 8 Mar 2005 03:29:47 -0000 1.14 +++ r300_vertexprog.c 12 Mar 2005 10:14:10 -0000 1.15 @@ -422,7 +422,6 @@ case VP_OPCODE_EXP: return R300_VPI_OUT_OP_EXP; case VP_OPCODE_FRC: return R300_VPI_OUT_OP_FRC; case VP_OPCODE_LG2: return R300_VPI_OUT_OP_LG2; - case VP_OPCODE_LIT: return R300_VPI_OUT_OP_LIT; case VP_OPCODE_LOG: return R300_VPI_OUT_OP_LOG; case VP_OPCODE_MAD: return R300_VPI_OUT_OP_MAD; case VP_OPCODE_MAX: return R300_VPI_OUT_OP_MAX; @@ -472,7 +471,10 @@ VERTEX_SHADER_INSTRUCTION t2rs[1024]; VERTEX_SHADER_INSTRUCTION *o_inst; unsigned long operands; - int u_temp_i=63; /* Initial value should be last tmp reg that hw supports */ + /* Initial value should be last tmp reg that hw supports. + Strangely enough r300 doesnt mind even though these would be out of range. + Smart enough to realize that it doesnt need it? */ + int u_temp_i=VSF_MAX_FRAGMENT_TEMPS-1; #ifdef SRCS_WRITABLE struct vp_src_register src[3]; #else @@ -501,12 +503,12 @@ o_inst->src1=MAKE_VSF_SOURCE(t_src_index(vp, &src[2]), SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W, - t_src_class(src[0].File), VSF_FLAG_NONE); + t_src_class(src[2].File), VSF_FLAG_NONE); o_inst->src2=MAKE_VSF_SOURCE(t_src_index(vp, &src[2]), SWIZZLE_ZERO, SWIZZLE_ZERO, SWIZZLE_ZERO, SWIZZLE_ZERO, - t_src_class(src[0].File), VSF_FLAG_NONE); + t_src_class(src[2].File), VSF_FLAG_NONE); o_inst->src3=0; o_inst++; @@ -601,7 +603,8 @@ #ifdef SRCS_WRITABLE vpi->Opcode=VP_OPCODE_MAX; src[1]=src[0]; - src[1].Negate=GL_TRUE; + src[1].Negate=!src[0].Negate; + operands=op_operands(vpi->Opcode); break; #else o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_MAX, vpi->DstReg.Index, @@ -647,6 +650,33 @@ u_temp_i--; goto next; + case VP_OPCODE_LIT://LIT TMP 1.Y Z TMP 1{} {X W Z Y} TMP 1{} {Y W Z X} TMP 1{} {Y X Z W} + o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_LIT, vpi->DstReg.Index, + t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File)); + /* NOTE: Users swizzling might not work. */ + o_inst->src1=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), + t_swizzle(src[0].Swizzle[0]), // x + t_swizzle(src[0].Swizzle[3]), // w + t_swizzle(src[0].Swizzle[2]), // z + t_swizzle(src[0].Swizzle[1]), // y + t_src_class(src[0].File), + src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE); + o_inst->src2=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), + t_swizzle(src[0].Swizzle[1]), // y + t_swizzle(src[0].Swizzle[3]), // w + t_swizzle(src[0].Swizzle[2]), // z + t_swizzle(src[0].Swizzle[0]), // x + t_src_class(src[0].File), + src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE); + o_inst->src3=MAKE_VSF_SOURCE(t_src_index(vp, &src[0]), + t_swizzle(src[0].Swizzle[1]), // y + t_swizzle(src[0].Swizzle[0]), // x + t_swizzle(src[0].Swizzle[2]), // z + t_swizzle(src[0].Swizzle[3]), // w + t_src_class(src[0].File), + src[0].Negate ? VSF_FLAG_ALL : VSF_FLAG_NONE); + goto next; + case VP_OPCODE_DPH://DOT RESULT 1.X Y Z W PARAM 0{} {X Y Z ONE} PARAM 0{} {X Y Z W} o_inst->op=MAKE_VSF_OP(R300_VPI_OUT_OP_DOT, vpi->DstReg.Index, t_dst_mask(vpi->DstReg.WriteMask), t_dst_class(vpi->DstReg.File)); @@ -662,7 +692,7 @@ o_inst->src3=0; goto next; - case VP_OPCODE_XPD: + case VP_OPCODE_XPD: /* Broken due to swizzling */ /* ADD TMP 0.X Y Z PARAM 0{} {X Y Z W} PARAM 0{} {ZERO ZERO ZERO ZERO} MUL TMP 1.X Y Z W TMP 0{} {Z X Y ZERO} PARAM 1{} {Y Z X ZERO} MAD RESULT 1.X Y Z W TMP 0{} {Y Z X ONE} PARAM 1{} {Z X Y ONE} TMP 1{X Y Z W } {X Y Z W} neg Xneg Yneg Zneg W*/ Index: r300_emit.h =================================================================== RCS file: /cvsroot/r300/r300_driver/r300/r300_emit.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- r300_emit.h 3 Mar 2005 23:18:19 -0000 1.9 +++ r300_emit.h 12 Mar 2005 10:14:10 -0000 1.10 @@ -200,13 +200,14 @@ } /* must be sent to switch to 2d commands */ +/* void static inline end_3d(PREFIX_VOID) { LOCAL_VARS (void)cmd_reserved; (void)cmd_written; cmd=(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, \ - 0, \ + 0, \ // ??! __FUNCTION__); \ cmd[0].header.cmd_type=R300_CMD_END3D; @@ -218,11 +219,12 @@ (void)cmd_reserved; (void)cmd_written; cmd=(drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, \ - 0, \ + 0, \ // ??! __FUNCTION__); \ cmd[0].i=cmdcpdelay(count); } +*/ /* fire vertex buffer */ static void inline fire_AOS(PREFIX int vertex_count, int type) Index: r300_state.c =================================================================== RCS file: /cvsroot/r300/r300_driver/r300/r300_state.c,v retrieving revision 1.85 retrieving revision 1.86 diff -u -d -r1.85 -r1.86 --- r300_state.c 8 Mar 2005 03:29:47 -0000 1.85 +++ r300_state.c 12 Mar 2005 10:14:10 -0000 1.86 @@ -1607,18 +1607,30 @@ void r300SetupVertexShader(r300ContextPtr rmesa) { GLcontext* ctx = rmesa->radeon.glCtx; + struct r300_vertex_shader_fragment unk4={ + length: 4, + body: { f: { + /*0.0*/(rand()%100)/10.0, + /*0.0*/(rand()%100)/10.0, + /*1.0*/(rand()%100)/10.0, + /*0.0*/(rand()%100)/10.0 + } } + }; LOCAL_VARS - if(rmesa->current_vp != NULL){ - r300SetupVertexProgram(rmesa); - return ; - } - /* Reset state, in case we don't use something */ ((drm_r300_cmd_header_t*)rmesa->hw.vpp.cmd)->vpu.count = 0; ((drm_r300_cmd_header_t*)rmesa->hw.vpi.cmd)->vpu.count = 0; ((drm_r300_cmd_header_t*)rmesa->hw.vps.cmd)->vpu.count = 0; + /* Not sure why this doesnt work... + 0x400 area might have something to do with pixel shaders as it appears right after pfs programming. + 0x406 is set to { 0.0, 0.0, 1.0, 0.0 } most of the time but should change with smooth points and in other rare cases. */ + //setup_vertex_shader_fragment(rmesa, 0x406, &unk4); + if(rmesa->current_vp != NULL){ + r300SetupVertexProgram(rmesa); + return ; + } /* This needs to be replaced by vertex shader generation code */ Index: r300_cmdbuf.c =================================================================== RCS file: /cvsroot/r300/r300_driver/r300/r300_cmdbuf.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- r300_cmdbuf.c 8 Mar 2005 22:29:45 -0000 1.36 +++ r300_cmdbuf.c 12 Mar 2005 10:14:09 -0000 1.37 @@ -601,7 +601,7 @@ assert(h < (1 << 16)); cmd = - (drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, 8 * sizeof(int), + (drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, 8, __FUNCTION__); cmd[0].header.cmd_type = R300_CMD_PACKET3; @@ -631,7 +631,7 @@ cmd = (drm_radeon_cmd_header_t *) r300AllocCmdBuf(rmesa, - 1 * sizeof(int), + 1, __FUNCTION__); cmd[0].i = 0; cmd[0].wait.cmd_type = R300_CMD_WAIT; Index: r300_context.h =================================================================== RCS file: /cvsroot/r300/r300_driver/r300/r300_context.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- r300_context.h 28 Feb 2005 00:27:03 -0000 1.50 +++ r300_context.h 12 Mar 2005 10:14:09 -0000 1.51 @@ -513,8 +513,11 @@ /* Vertex shader state */ -/* 64 appears to be the maximum */ -#define VSF_MAX_FRAGMENT_LENGTH (64*4) +/* Tested with rv350 and verified from misc web pages. */ +#define VSF_MAX_FRAGMENT_LENGTH (256*4) + +/* Tested with rv350 and verified from misc web pages. */ +#define VSF_MAX_FRAGMENT_TEMPS (32) struct r300_vertex_shader_fragment { Index: r300_context.c =================================================================== RCS file: /cvsroot/r300/r300_driver/r300/r300_context.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- r300_context.c 8 Mar 2005 03:29:47 -0000 1.14 +++ r300_context.c 12 Mar 2005 10:14:09 -0000 1.15 @@ -267,12 +267,12 @@ _mesa_enable_extension( ctx, "GL_NV_vertex_program"); #endif /* currently bogus data */ - ctx->Const.MaxVertexProgramInstructions=128; - ctx->Const.MaxVertexProgramAttribs=64; - ctx->Const.MaxVertexProgramTemps=64; - ctx->Const.MaxVertexProgramLocalParams=64; - ctx->Const.MaxVertexProgramEnvParams=64; - ctx->Const.MaxVertexProgramAddressRegs=8; + ctx->Const.MaxVertexProgramInstructions=VSF_MAX_FRAGMENT_LENGTH; + ctx->Const.MaxVertexProgramAttribs=16; // r420 + ctx->Const.MaxVertexProgramTemps=VSF_MAX_FRAGMENT_TEMPS; + ctx->Const.MaxVertexProgramLocalParams=256; // r420 + ctx->Const.MaxVertexProgramEnvParams=256; // r420 + ctx->Const.MaxVertexProgramAddressRegs=1; driInitExtensions(ctx, card_extensions, GL_TRUE); |