r600: fix typos for vert-tex

at least i think this is how it was meant to work
This commit is contained in:
Andre Maasikas 2009-12-15 10:22:34 +02:00
parent bae5e7f213
commit dbc374cd30
2 changed files with 3 additions and 3 deletions

View file

@ -1523,7 +1523,7 @@ GLboolean assemble_tex_instruction(r700_AssemblerBase *pAsm, GLboolean normalize
if(SPT_VP == pAsm->currentShaderType)
{
tex_instruction_ptr->m_Word0.f.resource_id = texture_unit_source->reg + VERT_ATTRIB_MAX;
pAsm->unVetTexBits |= 1 < texture_unit_source->reg;
pAsm->unVetTexBits |= 1 << texture_unit_source->reg;
}
else
{

View file

@ -75,7 +75,7 @@ static void r700SendTexState(GLcontext *ctx, struct radeon_state_atom *atom)
BEGIN_BATCH_NO_AUTOSTATE(9 + 4);
R600_OUT_BATCH(CP_PACKET3(R600_IT_SET_RESOURCE, 7));
if( (1<i) & vp->r700AsmCode.unVetTexBits )
if( (1<<i) & vp->r700AsmCode.unVetTexBits )
{ /* vs texture */
R600_OUT_BATCH((i + VERT_ATTRIB_MAX + SQ_FETCH_RESOURCE_VS_OFFSET) * FETCH_RESOURCE_STRIDE);
}
@ -127,7 +127,7 @@ static void r700SendTexSamplerState(GLcontext *ctx, struct radeon_state_atom *at
BEGIN_BATCH_NO_AUTOSTATE(5);
R600_OUT_BATCH(CP_PACKET3(R600_IT_SET_SAMPLER, 3));
if( (1<i) & vp->r700AsmCode.unVetTexBits )
if( (1<<i) & vp->r700AsmCode.unVetTexBits )
{ /* vs texture */
R600_OUT_BATCH((i+SQ_TEX_SAMPLER_VS_OFFSET) * SAMPLER_STRIDE); //work 1
}