KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r600: add TXL instruction and note about TXB

This commit is contained in:
Andre Maasikas 2010-09-02 18:16:42 +03:00
parent 1f12945d2f
commit 777f352e60
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/drivers/dri/r600/r700_assembler.c
View File

@ -619,7 +619,7 @@ int Init_r700_AssemblerBase(SHADER_PIPE_TYPE spt, r700_AssemblerBase* pAsm, R700
GLboolean IsTex(gl_inst_opcode Opcode) GLboolean IsTex(gl_inst_opcode Opcode)
{ {
if( (OPCODE_TEX==Opcode) || (OPCODE_TXP==Opcode) || (OPCODE_TXB==Opcode) || if( (OPCODE_TEX==Opcode) || (OPCODE_TXP==Opcode) || (OPCODE_TXB==Opcode) ||
(OPCODE_DDX==Opcode) || (OPCODE_DDY==Opcode) ) (OPCODE_DDX==Opcode) || (OPCODE_DDY==Opcode) || (OPCODE_TXL==Opcode) )
{ {
return GL_TRUE; return GL_TRUE;
} }
@ -923,9 +923,10 @@ GLboolean add_tex_instruction(r700_AssemblerBase* pAsm,
} }
} }
// If this clause constains any TEX instruction that is dependent on a previous instruction, // If this clause constains any TEX instruction that is dependent on a
// set the barrier bit // previous instruction, set the barrier bit, also always set for vert
if( pAsm->pInstDeps[pAsm->uiCurInst].nDstDep > (-1) || pAsm->need_tex_barrier == GL_TRUE ) // programs as tex deps are not(yet) computed for them
if( pAsm->currentShaderType == SPT_VP || pAsm->pInstDeps[pAsm->uiCurInst].nDstDep > (-1) || pAsm->need_tex_barrier == GL_TRUE )
{ {
pAsm->cf_current_tex_clause_ptr->m_Word1.f.barrier = 0x1; pAsm->cf_current_tex_clause_ptr->m_Word1.f.barrier = 0x1;
} }
@ -5277,6 +5278,11 @@ GLboolean assemble_TEX(r700_AssemblerBase *pAsm)
pAsm->D.dst.opcode = SQ_TEX_INST_GET_GRADIENTS_V; pAsm->D.dst.opcode = SQ_TEX_INST_GET_GRADIENTS_V;
break; break;
case OPCODE_TXB: case OPCODE_TXB:
/* this should actually be SAMPLE_LB but that needs bias to be
* embedded in the instruction - cant do here */
pAsm->D.dst.opcode = SQ_TEX_INST_SAMPLE_L;
break;
case OPCODE_TXL:
pAsm->D.dst.opcode = SQ_TEX_INST_SAMPLE_L; pAsm->D.dst.opcode = SQ_TEX_INST_SAMPLE_L;
break; break;
default: default:
@ -7105,6 +7111,7 @@ GLboolean AssembleInstr(GLuint uiFirstInst,
case OPCODE_DDY: case OPCODE_DDY:
case OPCODE_TEX: case OPCODE_TEX:
case OPCODE_TXB: case OPCODE_TXB:
case OPCODE_TXL:
case OPCODE_TXP: case OPCODE_TXP:
if ( GL_FALSE == assemble_TEX(pR700AsmCode) ) if ( GL_FALSE == assemble_TEX(pR700AsmCode) )
return GL_FALSE; return GL_FALSE;