Pass the sampling lod/bias as a separate parameter. This is necessary for cube or 2D array shadow texture sampling functions which need the fourth texture coordinate component for depth comparison while also taking a lod or bias parameter. Change-Id: I1e1399f134e22cecaff97a224df2c13c57ba3a40 Reviewed-on: https://swiftshader-review.googlesource.com/13551 Reviewed-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Shader/Shader.cpp b/src/Shader/Shader.cpp index e99f13a..f6c9f6f 100644 --- a/src/Shader/Shader.cpp +++ b/src/Shader/Shader.cpp
@@ -747,232 +747,234 @@ { switch(opcode) { - case OPCODE_NULL: return "null"; - case OPCODE_NOP: return "nop"; - case OPCODE_MOV: return "mov"; - case OPCODE_ADD: return "add"; - case OPCODE_IADD: return "iadd"; - case OPCODE_SUB: return "sub"; - case OPCODE_ISUB: return "isub"; - case OPCODE_MAD: return "mad"; - case OPCODE_IMAD: return "imad"; - case OPCODE_MUL: return "mul"; - case OPCODE_IMUL: return "imul"; - case OPCODE_RCPX: return "rcpx"; - case OPCODE_DIV: return "div"; - case OPCODE_IDIV: return "idiv"; - case OPCODE_UDIV: return "udiv"; - case OPCODE_MOD: return "mod"; - case OPCODE_IMOD: return "imod"; - case OPCODE_UMOD: return "umod"; - case OPCODE_SHL: return "shl"; - case OPCODE_ISHR: return "ishr"; - case OPCODE_USHR: return "ushr"; - case OPCODE_RSQX: return "rsqx"; - case OPCODE_SQRT: return "sqrt"; - case OPCODE_RSQ: return "rsq"; - case OPCODE_LEN2: return "len2"; - case OPCODE_LEN3: return "len3"; - case OPCODE_LEN4: return "len4"; - case OPCODE_DIST1: return "dist1"; - case OPCODE_DIST2: return "dist2"; - case OPCODE_DIST3: return "dist3"; - case OPCODE_DIST4: return "dist4"; - case OPCODE_DP3: return "dp3"; - case OPCODE_DP4: return "dp4"; - case OPCODE_DET2: return "det2"; - case OPCODE_DET3: return "det3"; - case OPCODE_DET4: return "det4"; - case OPCODE_MIN: return "min"; - case OPCODE_IMIN: return "imin"; - case OPCODE_UMIN: return "umin"; - case OPCODE_MAX: return "max"; - case OPCODE_IMAX: return "imax"; - case OPCODE_UMAX: return "umax"; - case OPCODE_SLT: return "slt"; - case OPCODE_SGE: return "sge"; - case OPCODE_EXP2X: return "exp2x"; - case OPCODE_LOG2X: return "log2x"; - case OPCODE_LIT: return "lit"; - case OPCODE_ATT: return "att"; - case OPCODE_LRP: return "lrp"; - case OPCODE_STEP: return "step"; - case OPCODE_SMOOTH: return "smooth"; - case OPCODE_FLOATBITSTOINT: return "floatBitsToInt"; + case OPCODE_NULL: return "null"; + case OPCODE_NOP: return "nop"; + case OPCODE_MOV: return "mov"; + case OPCODE_ADD: return "add"; + case OPCODE_IADD: return "iadd"; + case OPCODE_SUB: return "sub"; + case OPCODE_ISUB: return "isub"; + case OPCODE_MAD: return "mad"; + case OPCODE_IMAD: return "imad"; + case OPCODE_MUL: return "mul"; + case OPCODE_IMUL: return "imul"; + case OPCODE_RCPX: return "rcpx"; + case OPCODE_DIV: return "div"; + case OPCODE_IDIV: return "idiv"; + case OPCODE_UDIV: return "udiv"; + case OPCODE_MOD: return "mod"; + case OPCODE_IMOD: return "imod"; + case OPCODE_UMOD: return "umod"; + case OPCODE_SHL: return "shl"; + case OPCODE_ISHR: return "ishr"; + case OPCODE_USHR: return "ushr"; + case OPCODE_RSQX: return "rsqx"; + case OPCODE_SQRT: return "sqrt"; + case OPCODE_RSQ: return "rsq"; + case OPCODE_LEN2: return "len2"; + case OPCODE_LEN3: return "len3"; + case OPCODE_LEN4: return "len4"; + case OPCODE_DIST1: return "dist1"; + case OPCODE_DIST2: return "dist2"; + case OPCODE_DIST3: return "dist3"; + case OPCODE_DIST4: return "dist4"; + case OPCODE_DP3: return "dp3"; + case OPCODE_DP4: return "dp4"; + case OPCODE_DET2: return "det2"; + case OPCODE_DET3: return "det3"; + case OPCODE_DET4: return "det4"; + case OPCODE_MIN: return "min"; + case OPCODE_IMIN: return "imin"; + case OPCODE_UMIN: return "umin"; + case OPCODE_MAX: return "max"; + case OPCODE_IMAX: return "imax"; + case OPCODE_UMAX: return "umax"; + case OPCODE_SLT: return "slt"; + case OPCODE_SGE: return "sge"; + case OPCODE_EXP2X: return "exp2x"; + case OPCODE_LOG2X: return "log2x"; + case OPCODE_LIT: return "lit"; + case OPCODE_ATT: return "att"; + case OPCODE_LRP: return "lrp"; + case OPCODE_STEP: return "step"; + case OPCODE_SMOOTH: return "smooth"; + case OPCODE_FLOATBITSTOINT: return "floatBitsToInt"; case OPCODE_FLOATBITSTOUINT: return "floatBitsToUInt"; - case OPCODE_INTBITSTOFLOAT: return "intBitsToFloat"; + case OPCODE_INTBITSTOFLOAT: return "intBitsToFloat"; case OPCODE_UINTBITSTOFLOAT: return "uintBitsToFloat"; - case OPCODE_PACKSNORM2x16: return "packSnorm2x16"; - case OPCODE_PACKUNORM2x16: return "packUnorm2x16"; - case OPCODE_PACKHALF2x16: return "packHalf2x16"; + case OPCODE_PACKSNORM2x16: return "packSnorm2x16"; + case OPCODE_PACKUNORM2x16: return "packUnorm2x16"; + case OPCODE_PACKHALF2x16: return "packHalf2x16"; case OPCODE_UNPACKSNORM2x16: return "unpackSnorm2x16"; case OPCODE_UNPACKUNORM2x16: return "unpackUnorm2x16"; - case OPCODE_UNPACKHALF2x16: return "unpackHalf2x16"; - case OPCODE_FRC: return "frc"; - case OPCODE_M4X4: return "m4x4"; - case OPCODE_M4X3: return "m4x3"; - case OPCODE_M3X4: return "m3x4"; - case OPCODE_M3X3: return "m3x3"; - case OPCODE_M3X2: return "m3x2"; - case OPCODE_CALL: return "call"; - case OPCODE_CALLNZ: return "callnz"; - case OPCODE_LOOP: return "loop"; - case OPCODE_RET: return "ret"; - case OPCODE_ENDLOOP: return "endloop"; - case OPCODE_LABEL: return "label"; - case OPCODE_DCL: return "dcl"; - case OPCODE_POWX: return "powx"; - case OPCODE_CRS: return "crs"; - case OPCODE_SGN: return "sgn"; - case OPCODE_ISGN: return "isgn"; - case OPCODE_ABS: return "abs"; - case OPCODE_IABS: return "iabs"; - case OPCODE_NRM2: return "nrm2"; - case OPCODE_NRM3: return "nrm3"; - case OPCODE_NRM4: return "nrm4"; - case OPCODE_SINCOS: return "sincos"; - case OPCODE_REP: return "rep"; - case OPCODE_ENDREP: return "endrep"; - case OPCODE_IF: return "if"; - case OPCODE_IFC: return "ifc"; - case OPCODE_ELSE: return "else"; - case OPCODE_ENDIF: return "endif"; - case OPCODE_BREAK: return "break"; - case OPCODE_BREAKC: return "breakc"; - case OPCODE_MOVA: return "mova"; - case OPCODE_DEFB: return "defb"; - case OPCODE_DEFI: return "defi"; - case OPCODE_TEXCOORD: return "texcoord"; - case OPCODE_TEXKILL: return "texkill"; - case OPCODE_DISCARD: return "discard"; + case OPCODE_UNPACKHALF2x16: return "unpackHalf2x16"; + case OPCODE_FRC: return "frc"; + case OPCODE_M4X4: return "m4x4"; + case OPCODE_M4X3: return "m4x3"; + case OPCODE_M3X4: return "m3x4"; + case OPCODE_M3X3: return "m3x3"; + case OPCODE_M3X2: return "m3x2"; + case OPCODE_CALL: return "call"; + case OPCODE_CALLNZ: return "callnz"; + case OPCODE_LOOP: return "loop"; + case OPCODE_RET: return "ret"; + case OPCODE_ENDLOOP: return "endloop"; + case OPCODE_LABEL: return "label"; + case OPCODE_DCL: return "dcl"; + case OPCODE_POWX: return "powx"; + case OPCODE_CRS: return "crs"; + case OPCODE_SGN: return "sgn"; + case OPCODE_ISGN: return "isgn"; + case OPCODE_ABS: return "abs"; + case OPCODE_IABS: return "iabs"; + case OPCODE_NRM2: return "nrm2"; + case OPCODE_NRM3: return "nrm3"; + case OPCODE_NRM4: return "nrm4"; + case OPCODE_SINCOS: return "sincos"; + case OPCODE_REP: return "rep"; + case OPCODE_ENDREP: return "endrep"; + case OPCODE_IF: return "if"; + case OPCODE_IFC: return "ifc"; + case OPCODE_ELSE: return "else"; + case OPCODE_ENDIF: return "endif"; + case OPCODE_BREAK: return "break"; + case OPCODE_BREAKC: return "breakc"; + case OPCODE_MOVA: return "mova"; + case OPCODE_DEFB: return "defb"; + case OPCODE_DEFI: return "defi"; + case OPCODE_TEXCOORD: return "texcoord"; + case OPCODE_TEXKILL: return "texkill"; + case OPCODE_DISCARD: return "discard"; case OPCODE_TEX: - if(version < 0x0104) return "tex"; - else return "texld"; - case OPCODE_TEXBEM: return "texbem"; - case OPCODE_TEXBEML: return "texbeml"; - case OPCODE_TEXREG2AR: return "texreg2ar"; - case OPCODE_TEXREG2GB: return "texreg2gb"; - case OPCODE_TEXM3X2PAD: return "texm3x2pad"; - case OPCODE_TEXM3X2TEX: return "texm3x2tex"; - case OPCODE_TEXM3X3PAD: return "texm3x3pad"; - case OPCODE_TEXM3X3TEX: return "texm3x3tex"; - case OPCODE_RESERVED0: return "reserved0"; - case OPCODE_TEXM3X3SPEC: return "texm3x3spec"; - case OPCODE_TEXM3X3VSPEC: return "texm3x3vspec"; - case OPCODE_EXPP: return "expp"; - case OPCODE_LOGP: return "logp"; - case OPCODE_CND: return "cnd"; - case OPCODE_DEF: return "def"; - case OPCODE_TEXREG2RGB: return "texreg2rgb"; - case OPCODE_TEXDP3TEX: return "texdp3tex"; - case OPCODE_TEXM3X2DEPTH: return "texm3x2depth"; - case OPCODE_TEXDP3: return "texdp3"; - case OPCODE_TEXM3X3: return "texm3x3"; - case OPCODE_TEXDEPTH: return "texdepth"; - case OPCODE_CMP0: return "cmp0"; - case OPCODE_ICMP: return "icmp"; - case OPCODE_UCMP: return "ucmp"; - case OPCODE_SELECT: return "select"; - case OPCODE_EXTRACT: return "extract"; - case OPCODE_INSERT: return "insert"; - case OPCODE_BEM: return "bem"; - case OPCODE_DP2ADD: return "dp2add"; - case OPCODE_DFDX: return "dFdx"; - case OPCODE_DFDY: return "dFdy"; - case OPCODE_FWIDTH: return "fwidth"; - case OPCODE_TEXLDD: return "texldd"; - case OPCODE_CMP: return "cmp"; - case OPCODE_TEXLDL: return "texldl"; - case OPCODE_TEXOFFSET: return "texoffset"; - case OPCODE_TEXLDLOFFSET: return "texldloffset"; - case OPCODE_TEXELFETCH: return "texelfetch"; + if(version < 0x0104) return "tex"; + else return "texld"; + case OPCODE_TEXBEM: return "texbem"; + case OPCODE_TEXBEML: return "texbeml"; + case OPCODE_TEXREG2AR: return "texreg2ar"; + case OPCODE_TEXREG2GB: return "texreg2gb"; + case OPCODE_TEXM3X2PAD: return "texm3x2pad"; + case OPCODE_TEXM3X2TEX: return "texm3x2tex"; + case OPCODE_TEXM3X3PAD: return "texm3x3pad"; + case OPCODE_TEXM3X3TEX: return "texm3x3tex"; + case OPCODE_RESERVED0: return "reserved0"; + case OPCODE_TEXM3X3SPEC: return "texm3x3spec"; + case OPCODE_TEXM3X3VSPEC: return "texm3x3vspec"; + case OPCODE_EXPP: return "expp"; + case OPCODE_LOGP: return "logp"; + case OPCODE_CND: return "cnd"; + case OPCODE_DEF: return "def"; + case OPCODE_TEXREG2RGB: return "texreg2rgb"; + case OPCODE_TEXDP3TEX: return "texdp3tex"; + case OPCODE_TEXM3X2DEPTH: return "texm3x2depth"; + case OPCODE_TEXDP3: return "texdp3"; + case OPCODE_TEXM3X3: return "texm3x3"; + case OPCODE_TEXDEPTH: return "texdepth"; + case OPCODE_CMP0: return "cmp0"; + case OPCODE_ICMP: return "icmp"; + case OPCODE_UCMP: return "ucmp"; + case OPCODE_SELECT: return "select"; + case OPCODE_EXTRACT: return "extract"; + case OPCODE_INSERT: return "insert"; + case OPCODE_BEM: return "bem"; + case OPCODE_DP2ADD: return "dp2add"; + case OPCODE_DFDX: return "dFdx"; + case OPCODE_DFDY: return "dFdy"; + case OPCODE_FWIDTH: return "fwidth"; + case OPCODE_TEXLDD: return "texldd"; + case OPCODE_CMP: return "cmp"; + case OPCODE_TEXLDL: return "texldl"; + case OPCODE_TEXBIAS: return "texbias"; + case OPCODE_TEXOFFSET: return "texoffset"; + case OPCODE_TEXOFFSETBIAS: return "texoffsetbias"; + case OPCODE_TEXLODOFFSET: return "texlodoffset"; + case OPCODE_TEXELFETCH: return "texelfetch"; case OPCODE_TEXELFETCHOFFSET: return "texelfetchoffset"; - case OPCODE_TEXGRAD: return "texgrad"; - case OPCODE_TEXGRADOFFSET: return "texgradoffset"; - case OPCODE_BREAKP: return "breakp"; - case OPCODE_TEXSIZE: return "texsize"; - case OPCODE_PHASE: return "phase"; - case OPCODE_COMMENT: return "comment"; - case OPCODE_END: return "end"; - case OPCODE_PS_1_0: return "ps_1_0"; - case OPCODE_PS_1_1: return "ps_1_1"; - case OPCODE_PS_1_2: return "ps_1_2"; - case OPCODE_PS_1_3: return "ps_1_3"; - case OPCODE_PS_1_4: return "ps_1_4"; - case OPCODE_PS_2_0: return "ps_2_0"; - case OPCODE_PS_2_x: return "ps_2_x"; - case OPCODE_PS_3_0: return "ps_3_0"; - case OPCODE_VS_1_0: return "vs_1_0"; - case OPCODE_VS_1_1: return "vs_1_1"; - case OPCODE_VS_2_0: return "vs_2_0"; - case OPCODE_VS_2_x: return "vs_2_x"; - case OPCODE_VS_2_sw: return "vs_2_sw"; - case OPCODE_VS_3_0: return "vs_3_0"; - case OPCODE_VS_3_sw: return "vs_3_sw"; - case OPCODE_WHILE: return "while"; - case OPCODE_ENDWHILE: return "endwhile"; - case OPCODE_COS: return "cos"; - case OPCODE_SIN: return "sin"; - case OPCODE_TAN: return "tan"; - case OPCODE_ACOS: return "acos"; - case OPCODE_ASIN: return "asin"; - case OPCODE_ATAN: return "atan"; - case OPCODE_ATAN2: return "atan2"; - case OPCODE_COSH: return "cosh"; - case OPCODE_SINH: return "sinh"; - case OPCODE_TANH: return "tanh"; - case OPCODE_ACOSH: return "acosh"; - case OPCODE_ASINH: return "asinh"; - case OPCODE_ATANH: return "atanh"; - case OPCODE_DP1: return "dp1"; - case OPCODE_DP2: return "dp2"; - case OPCODE_TRUNC: return "trunc"; - case OPCODE_FLOOR: return "floor"; - case OPCODE_ROUND: return "round"; - case OPCODE_ROUNDEVEN: return "roundEven"; - case OPCODE_CEIL: return "ceil"; - case OPCODE_EXP2: return "exp2"; - case OPCODE_LOG2: return "log2"; - case OPCODE_EXP: return "exp"; - case OPCODE_LOG: return "log"; - case OPCODE_POW: return "pow"; - case OPCODE_F2B: return "f2b"; - case OPCODE_B2F: return "b2f"; - case OPCODE_F2I: return "f2i"; - case OPCODE_I2F: return "i2f"; - case OPCODE_F2U: return "f2u"; - case OPCODE_U2F: return "u2f"; - case OPCODE_B2I: return "b2i"; - case OPCODE_I2B: return "i2b"; - case OPCODE_ALL: return "all"; - case OPCODE_ANY: return "any"; - case OPCODE_NEG: return "neg"; - case OPCODE_INEG: return "ineg"; - case OPCODE_ISNAN: return "isnan"; - case OPCODE_ISINF: return "isinf"; - case OPCODE_NOT: return "not"; - case OPCODE_OR: return "or"; - case OPCODE_XOR: return "xor"; - case OPCODE_AND: return "and"; - case OPCODE_EQ: return "eq"; - case OPCODE_NE: return "neq"; - case OPCODE_FORWARD1: return "forward1"; - case OPCODE_FORWARD2: return "forward2"; - case OPCODE_FORWARD3: return "forward3"; - case OPCODE_FORWARD4: return "forward4"; - case OPCODE_REFLECT1: return "reflect1"; - case OPCODE_REFLECT2: return "reflect2"; - case OPCODE_REFLECT3: return "reflect3"; - case OPCODE_REFLECT4: return "reflect4"; - case OPCODE_REFRACT1: return "refract1"; - case OPCODE_REFRACT2: return "refract2"; - case OPCODE_REFRACT3: return "refract3"; - case OPCODE_REFRACT4: return "refract4"; - case OPCODE_LEAVE: return "leave"; - case OPCODE_CONTINUE: return "continue"; - case OPCODE_TEST: return "test"; - case OPCODE_SWITCH: return "switch"; - case OPCODE_ENDSWITCH: return "endswitch"; + case OPCODE_TEXGRAD: return "texgrad"; + case OPCODE_TEXGRADOFFSET: return "texgradoffset"; + case OPCODE_BREAKP: return "breakp"; + case OPCODE_TEXSIZE: return "texsize"; + case OPCODE_PHASE: return "phase"; + case OPCODE_COMMENT: return "comment"; + case OPCODE_END: return "end"; + case OPCODE_PS_1_0: return "ps_1_0"; + case OPCODE_PS_1_1: return "ps_1_1"; + case OPCODE_PS_1_2: return "ps_1_2"; + case OPCODE_PS_1_3: return "ps_1_3"; + case OPCODE_PS_1_4: return "ps_1_4"; + case OPCODE_PS_2_0: return "ps_2_0"; + case OPCODE_PS_2_x: return "ps_2_x"; + case OPCODE_PS_3_0: return "ps_3_0"; + case OPCODE_VS_1_0: return "vs_1_0"; + case OPCODE_VS_1_1: return "vs_1_1"; + case OPCODE_VS_2_0: return "vs_2_0"; + case OPCODE_VS_2_x: return "vs_2_x"; + case OPCODE_VS_2_sw: return "vs_2_sw"; + case OPCODE_VS_3_0: return "vs_3_0"; + case OPCODE_VS_3_sw: return "vs_3_sw"; + case OPCODE_WHILE: return "while"; + case OPCODE_ENDWHILE: return "endwhile"; + case OPCODE_COS: return "cos"; + case OPCODE_SIN: return "sin"; + case OPCODE_TAN: return "tan"; + case OPCODE_ACOS: return "acos"; + case OPCODE_ASIN: return "asin"; + case OPCODE_ATAN: return "atan"; + case OPCODE_ATAN2: return "atan2"; + case OPCODE_COSH: return "cosh"; + case OPCODE_SINH: return "sinh"; + case OPCODE_TANH: return "tanh"; + case OPCODE_ACOSH: return "acosh"; + case OPCODE_ASINH: return "asinh"; + case OPCODE_ATANH: return "atanh"; + case OPCODE_DP1: return "dp1"; + case OPCODE_DP2: return "dp2"; + case OPCODE_TRUNC: return "trunc"; + case OPCODE_FLOOR: return "floor"; + case OPCODE_ROUND: return "round"; + case OPCODE_ROUNDEVEN: return "roundEven"; + case OPCODE_CEIL: return "ceil"; + case OPCODE_EXP2: return "exp2"; + case OPCODE_LOG2: return "log2"; + case OPCODE_EXP: return "exp"; + case OPCODE_LOG: return "log"; + case OPCODE_POW: return "pow"; + case OPCODE_F2B: return "f2b"; + case OPCODE_B2F: return "b2f"; + case OPCODE_F2I: return "f2i"; + case OPCODE_I2F: return "i2f"; + case OPCODE_F2U: return "f2u"; + case OPCODE_U2F: return "u2f"; + case OPCODE_B2I: return "b2i"; + case OPCODE_I2B: return "i2b"; + case OPCODE_ALL: return "all"; + case OPCODE_ANY: return "any"; + case OPCODE_NEG: return "neg"; + case OPCODE_INEG: return "ineg"; + case OPCODE_ISNAN: return "isnan"; + case OPCODE_ISINF: return "isinf"; + case OPCODE_NOT: return "not"; + case OPCODE_OR: return "or"; + case OPCODE_XOR: return "xor"; + case OPCODE_AND: return "and"; + case OPCODE_EQ: return "eq"; + case OPCODE_NE: return "neq"; + case OPCODE_FORWARD1: return "forward1"; + case OPCODE_FORWARD2: return "forward2"; + case OPCODE_FORWARD3: return "forward3"; + case OPCODE_FORWARD4: return "forward4"; + case OPCODE_REFLECT1: return "reflect1"; + case OPCODE_REFLECT2: return "reflect2"; + case OPCODE_REFLECT3: return "reflect3"; + case OPCODE_REFLECT4: return "reflect4"; + case OPCODE_REFRACT1: return "refract1"; + case OPCODE_REFRACT2: return "refract2"; + case OPCODE_REFRACT3: return "refract3"; + case OPCODE_REFRACT4: return "refract4"; + case OPCODE_LEAVE: return "leave"; + case OPCODE_CONTINUE: return "continue"; + case OPCODE_TEST: return "test"; + case OPCODE_SWITCH: return "switch"; + case OPCODE_ENDSWITCH: return "endswitch"; default: ASSERT(false); } @@ -1824,8 +1826,10 @@ case OPCODE_TEXM3X2DEPTH: case OPCODE_TEXLDD: case OPCODE_TEXLDL: + case OPCODE_TEXLOD: case OPCODE_TEXOFFSET: - case OPCODE_TEXLDLOFFSET: + case OPCODE_TEXOFFSETBIAS: + case OPCODE_TEXLODOFFSET: case OPCODE_TEXELFETCH: case OPCODE_TEXELFETCHOFFSET: case OPCODE_TEXGRAD: