mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-10 17:01:24 +12:00
FP: Implement texture lookup with explicit gradients (#1706)
This commit is contained in:
parent
214d3d0f1a
commit
fc1408e643
5 changed files with 43 additions and 1 deletions
|
@ -477,7 +477,23 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
case RSX_FP_OPCODE_TXPBEM: SetDst("textureProj($t, $0.xyz, $1.x)"); return true;
|
case RSX_FP_OPCODE_TXPBEM: SetDst("textureProj($t, $0.xyz, $1.x)"); return true;
|
||||||
case RSX_FP_OPCODE_TXD: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: TXD"); return true;
|
case RSX_FP_OPCODE_TXD:
|
||||||
|
switch (m_prog.get_texture_dimension(dst.tex_num))
|
||||||
|
{
|
||||||
|
case rsx::texture_dimension_extended::texture_dimension_1d:
|
||||||
|
SetDst(getFunction(FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_GRAD));
|
||||||
|
return true;
|
||||||
|
case rsx::texture_dimension_extended::texture_dimension_2d:
|
||||||
|
SetDst(getFunction(FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD));
|
||||||
|
return true;
|
||||||
|
case rsx::texture_dimension_extended::texture_dimension_cubemap:
|
||||||
|
SetDst(getFunction(FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_GRAD));
|
||||||
|
return true;
|
||||||
|
case rsx::texture_dimension_extended::texture_dimension_3d:
|
||||||
|
SetDst(getFunction(FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_GRAD));
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
case RSX_FP_OPCODE_TXB: SetDst("texture($t, $0.xy, $1.x)"); return true;
|
case RSX_FP_OPCODE_TXB: SetDst("texture($t, $0.xy, $1.x)"); return true;
|
||||||
case RSX_FP_OPCODE_TXL:
|
case RSX_FP_OPCODE_TXL:
|
||||||
switch (m_prog.get_texture_dimension(dst.tex_num))
|
switch (m_prog.get_texture_dimension(dst.tex_num))
|
||||||
|
|
|
@ -19,15 +19,19 @@ enum class FUNCTION {
|
||||||
FUNCTION_TEXTURE_SAMPLE1D,
|
FUNCTION_TEXTURE_SAMPLE1D,
|
||||||
FUNCTION_TEXTURE_SAMPLE1D_PROJ,
|
FUNCTION_TEXTURE_SAMPLE1D_PROJ,
|
||||||
FUNCTION_TEXTURE_SAMPLE1D_LOD,
|
FUNCTION_TEXTURE_SAMPLE1D_LOD,
|
||||||
|
FUNCTION_TEXTURE_SAMPLE1D_GRAD,
|
||||||
FUNCTION_TEXTURE_SAMPLE2D,
|
FUNCTION_TEXTURE_SAMPLE2D,
|
||||||
FUNCTION_TEXTURE_SAMPLE2D_PROJ,
|
FUNCTION_TEXTURE_SAMPLE2D_PROJ,
|
||||||
FUNCTION_TEXTURE_SAMPLE2D_LOD,
|
FUNCTION_TEXTURE_SAMPLE2D_LOD,
|
||||||
|
FUNCTION_TEXTURE_SAMPLE2D_GRAD,
|
||||||
FUNCTION_TEXTURE_SAMPLECUBE,
|
FUNCTION_TEXTURE_SAMPLECUBE,
|
||||||
FUNCTION_TEXTURE_SAMPLECUBE_PROJ,
|
FUNCTION_TEXTURE_SAMPLECUBE_PROJ,
|
||||||
FUNCTION_TEXTURE_SAMPLECUBE_LOD,
|
FUNCTION_TEXTURE_SAMPLECUBE_LOD,
|
||||||
|
FUNCTION_TEXTURE_SAMPLECUBE_GRAD,
|
||||||
FUNCTION_TEXTURE_SAMPLE3D,
|
FUNCTION_TEXTURE_SAMPLE3D,
|
||||||
FUNCTION_TEXTURE_SAMPLE3D_PROJ,
|
FUNCTION_TEXTURE_SAMPLE3D_PROJ,
|
||||||
FUNCTION_TEXTURE_SAMPLE3D_LOD,
|
FUNCTION_TEXTURE_SAMPLE3D_LOD,
|
||||||
|
FUNCTION_TEXTURE_SAMPLE3D_GRAD,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class COMPARE {
|
enum class COMPARE {
|
||||||
|
|
|
@ -48,24 +48,32 @@ std::string getFunctionImp(FUNCTION f)
|
||||||
return "$t.Sample($tsampler, ($0.x / $0.w))";
|
return "$t.Sample($tsampler, ($0.x / $0.w))";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD:
|
||||||
return "$t.SampleLevel($tsampler, $0.x, $1)";
|
return "$t.SampleLevel($tsampler, $0.x, $1)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_GRAD:
|
||||||
|
return "$t.SampleGrad($tsampler, $0.x, $1, $2)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
|
||||||
return "$t.Sample($tsampler, $0.xy * $t_scale)";
|
return "$t.Sample($tsampler, $0.xy * $t_scale)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ:
|
||||||
return "$t.Sample($tsampler, ($0.xy / $0.w) * $t_scale)";
|
return "$t.Sample($tsampler, ($0.xy / $0.w) * $t_scale)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD:
|
||||||
return "$t.SampleLevel($tsampler, $0.xy * $t_scale, $1)";
|
return "$t.SampleLevel($tsampler, $0.xy * $t_scale, $1)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD:
|
||||||
|
return "$t.SampleGrad($tsampler, $0.xy, $1, $2)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:
|
||||||
return "$t.Sample($tsampler, $0.xyz)";
|
return "$t.Sample($tsampler, $0.xyz)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ:
|
||||||
return "$t.Sample($tsampler, ($0.xyz / $0.w))";
|
return "$t.Sample($tsampler, ($0.xyz / $0.w))";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD:
|
||||||
return "$t.SampleLevel($tsampler, $0.xyz, $1)";
|
return "$t.SampleLevel($tsampler, $0.xyz, $1)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_GRAD:
|
||||||
|
return "$t.SampleGrad($tsampler, $0.xyz, $1, $2)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D:
|
||||||
return "$t.Sample($tsampler, $0.xyz)";
|
return "$t.Sample($tsampler, $0.xyz)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_PROJ:
|
||||||
return "$t.Sample($tsampler, ($0.xyz / $0.w))";
|
return "$t.Sample($tsampler, ($0.xyz / $0.w))";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_LOD:
|
||||||
return "$t.SampleLevel($tsampler, $0.xyz, $1)";
|
return "$t.SampleLevel($tsampler, $0.xyz, $1)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_GRAD:
|
||||||
|
return "$t.SampleGrad($tsampler, $0.xyz, $1, $2)";
|
||||||
case FUNCTION::FUNCTION_DFDX:
|
case FUNCTION::FUNCTION_DFDX:
|
||||||
return "ddx($0)";
|
return "ddx($0)";
|
||||||
case FUNCTION::FUNCTION_DFDY:
|
case FUNCTION::FUNCTION_DFDY:
|
||||||
|
|
|
@ -46,24 +46,32 @@ std::string getFunctionImpl(FUNCTION f)
|
||||||
return "textureProj($t, $0.x, $1.x)"; // Note: $1.x is bias
|
return "textureProj($t, $0.x, $1.x)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD:
|
||||||
return "textureLod($t, $0.x, $1)";
|
return "textureLod($t, $0.x, $1)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_GRAD:
|
||||||
|
return "textureGrad($t, $0.x, $1.x, $2.y)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
|
||||||
return "texture($t, $0.xy * $t_coord_scale)";
|
return "texture($t, $0.xy * $t_coord_scale)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ:
|
||||||
return "textureProj($t, $0.xyz * vec3($t_coord_scale, 1.) , $1.x)"; // Note: $1.x is bias
|
return "textureProj($t, $0.xyz * vec3($t_coord_scale, 1.) , $1.x)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD:
|
||||||
return "textureLod($t, $0.xy * $t_coord_scale, $1.x)";
|
return "textureLod($t, $0.xy * $t_coord_scale, $1.x)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD:
|
||||||
|
return "textureGrad($t, $0.xyz * vec3($t_coord_scale, 1.) , $1.x, $2.y)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:
|
||||||
return "texture($t, $0.xyz)";
|
return "texture($t, $0.xyz)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ:
|
||||||
return "textureProj($t, $0.xyzw, $1.x)"; // Note: $1.x is bias
|
return "textureProj($t, $0.xyzw, $1.x)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD:
|
||||||
return "textureLod($t, $0.xyz, $1.x)";
|
return "textureLod($t, $0.xyz, $1.x)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_GRAD:
|
||||||
|
return "textureGrad($t, $0.xyzw, $1.x, $2.y)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D:
|
||||||
return "texture($t, $0.xyz)";
|
return "texture($t, $0.xyz)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_PROJ:
|
||||||
return "textureProj($t, $0.xyzw, $1.x)"; // Note: $1.x is bias
|
return "textureProj($t, $0.xyzw, $1.x)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_LOD:
|
||||||
return "textureLod($t, $0.xyz, $1.x)";
|
return "textureLod($t, $0.xyz, $1.x)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE3D_GRAD:
|
||||||
|
return "textureGrad($t, $0.xyzw, $1.x, $2.y)";
|
||||||
case FUNCTION::FUNCTION_DFDX:
|
case FUNCTION::FUNCTION_DFDX:
|
||||||
return "dFdx($0)";
|
return "dFdx($0)";
|
||||||
case FUNCTION::FUNCTION_DFDY:
|
case FUNCTION::FUNCTION_DFDY:
|
||||||
|
|
|
@ -49,18 +49,24 @@ namespace vk
|
||||||
return "textureProj($t, $0.x, $1.x)"; // Note: $1.x is bias
|
return "textureProj($t, $0.x, $1.x)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_LOD:
|
||||||
return "textureLod($t, $0.x, $1.x)";
|
return "textureLod($t, $0.x, $1.x)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE1D_GRAD:
|
||||||
|
return "textureGrad($t, $0.x, $1.x, $2.y)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
|
||||||
return "texture($t, $0.xy)";
|
return "texture($t, $0.xy)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_PROJ:
|
||||||
return "textureProj($t, $0.xyz, $1.x)"; // Note: $1.x is bias
|
return "textureProj($t, $0.xyz, $1.x)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_LOD:
|
||||||
return "textureLod($t, $0.xy, $1.x)";
|
return "textureLod($t, $0.xy, $1.x)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D_GRAD:
|
||||||
|
return "textureGrad($t, $0.xyz, $1.x, $2.y)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE:
|
||||||
return "texture($t, $0.xyz)";
|
return "texture($t, $0.xyz)";
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_PROJ:
|
||||||
return "textureProj($t, $0.xyzw, $1.x)"; // Note: $1.x is bias
|
return "textureProj($t, $0.xyzw, $1.x)"; // Note: $1.x is bias
|
||||||
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD:
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_LOD:
|
||||||
return "textureLod($t, $0.xyz, $1.x)";
|
return "textureLod($t, $0.xyz, $1.x)";
|
||||||
|
case FUNCTION::FUNCTION_TEXTURE_SAMPLECUBE_GRAD:
|
||||||
|
return "textureGrad($t, $0.xyzw, $1.x, $2.y)";
|
||||||
case FUNCTION::FUNCTION_DFDX:
|
case FUNCTION::FUNCTION_DFDX:
|
||||||
return "dFdx($0)";
|
return "dFdx($0)";
|
||||||
case FUNCTION::FUNCTION_DFDY:
|
case FUNCTION::FUNCTION_DFDY:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue