Module: wine Branch: master Commit: c5eb5312496f226312b3f8d6d87f3974870a7c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5eb5312496f226312b3f8d6d8... Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 5 20:12:06 2007 +0200 wined3d: Bem is an instruction and uses registers. --- dlls/wined3d/baseshader.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 555929c..6533810 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -315,14 +315,6 @@ HRESULT shader_get_registers_used( reg_maps->labels[snum] = 1; pToken += curOpcode->num_params; - } else if(WINED3DSIO_BEM == curOpcode->opcode) { - DWORD regnum = *pToken & WINED3DSP_REGNUM_MASK; - if(reg_maps->bumpmat != -1 && reg_maps->bumpmat != regnum) { - FIXME("Pixel shader uses bem or texbem instruction on more than 1 sampler\n"); - } else { - reg_maps->bumpmat = regnum; - } - /* Set texture, address, temporary registers */ } else { int i, limit; @@ -383,6 +375,13 @@ HRESULT shader_get_registers_used( } if(WINED3DSIO_NRM == curOpcode->opcode) { reg_maps->usesnrm = 1; + } else if(WINED3DSIO_BEM == curOpcode->opcode) { + DWORD regnum = *pToken & WINED3DSP_REGNUM_MASK; + if(reg_maps->bumpmat != -1 && reg_maps->bumpmat != regnum) { + FIXME("Pixel shader uses bem or texbem instruction on more than 1 sampler\n"); + } else { + reg_maps->bumpmat = regnum; + } } /* This will loop over all the registers and try to