RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

d3d12: Use unnormalized_coords info in RSXFragment

Browse Source
This commit is contained in:
Vincent Lejeune 2016-01-26 20:25:35 +01:00
parent f6d2409b20
commit 3d960064ef
3 changed files with 7 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp
View File

@ -212,22 +212,6 @@ void D3D12GSRender::upload_and_bind_scale_offset_matrix(size_t descriptorIndex)
float alpha_ref = (float&)rsx::method_registers[NV4097_SET_ALPHA_REF];
memcpy((char*)mapped_buffer + 16 * sizeof(float), &is_alpha_tested, sizeof(int));
memcpy((char*)mapped_buffer + 17 * sizeof(float), &alpha_ref, sizeof(float));
size_t tex_idx = 0;
for (u32 i = 0; i < rsx::limits::textures_count; ++i)
{
if (!textures[i].enabled())
{
int is_unorm = false;
memcpy((char*)mapped_buffer + (18 + tex_idx++) * sizeof(int), &is_unorm, sizeof(int));
continue;
}
size_t w = textures[i].width(), h = textures[i].height();
// if (!w || !h) continue;
int is_unorm = (textures[i].format() & CELL_GCM_TEXTURE_UN);
memcpy((char*)mapped_buffer + (18 + tex_idx++) * sizeof(int), &is_unorm, sizeof(int));
}
m_buffer_data.unmap(CD3DX12_RANGE(heap_offset, heap_offset + 256));
D3D12_CONSTANT_BUFFER_VIEW_DESC constant_buffer_view_desc = {

24
rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
View File

@ -39,22 +39,6 @@ void D3D12FragmentDecompiler::insertHeader(std::stringstream & OS)
OS << " float4x4 scaleOffsetMat;" << std::endl;
OS << " int isAlphaTested;" << std::endl;
OS << " float alphaRef;" << std::endl;
OS << " int tex0_is_unorm;" << std::endl;
OS << " int tex1_is_unorm;" << std::endl;
OS << " int tex2_is_unorm;" << std::endl;
OS << " int tex3_is_unorm;" << std::endl;
OS << " int tex4_is_unorm;" << std::endl;
OS << " int tex5_is_unorm;" << std::endl;
OS << " int tex6_is_unorm;" << std::endl;
OS << " int tex7_is_unorm;" << std::endl;
OS << " int tex8_is_unorm;" << std::endl;
OS << " int tex9_is_unorm;" << std::endl;
OS << " int tex10_is_unorm;" << std::endl;
OS << " int tex11_is_unorm;" << std::endl;
OS << " int tex12_is_unorm;" << std::endl;
OS << " int tex13_is_unorm;" << std::endl;
OS << " int tex14_is_unorm;" << std::endl;
OS << " int tex15_is_unorm;" << std::endl;
OS << "};" << std::endl;
}
@ -209,9 +193,15 @@ void D3D12FragmentDecompiler::insertMainStart(std::stringstream & OS)
for (const ParamItem& PI : PT.items)
{
size_t textureIndex = atoi(PI.name.data() + 3);
bool is_unorm = !!(m_prog.unnormalized_coords & (1 << textureIndex));
if (!is_unorm)
{
OS << " float2 " << PI.name << "_scale = float2(1., 1.);" << std::endl;
continue;
}
OS << " float2 " << PI.name << "_dim;" << std::endl;
OS << " " << PI.name << ".GetDimensions(" << PI.name << "_dim.x, " << PI.name << "_dim.y);" << std::endl;
OS << " float2 " << PI.name << "_scale = (!!" << PI.name << "_is_unorm) ? float2(1., 1.) / " << PI.name << "_dim : float2(1., 1.);" << std::endl;
OS << " float2 " << PI.name << "_scale = float2(1., 1.) / " << PI.name << "_dim;" << std::endl;
}
}
}

16
rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp
View File

@ -33,22 +33,6 @@ void D3D12VertexProgramDecompiler::insertHeader(std::stringstream &OS)
OS << " float4x4 scaleOffsetMat;" << std::endl;
OS << " int isAlphaTested;" << std::endl;
OS << " float alphaRef;" << std::endl;
OS << " int tex0_is_unorm;" << std::endl;
OS << " int tex1_is_unorm;" << std::endl;
OS << " int tex2_is_unorm;" << std::endl;
OS << " int tex3_is_unorm;" << std::endl;
OS << " int tex4_is_unorm;" << std::endl;
OS << " int tex5_is_unorm;" << std::endl;
OS << " int tex6_is_unorm;" << std::endl;
OS << " int tex7_is_unorm;" << std::endl;
OS << " int tex8_is_unorm;" << std::endl;
OS << " int tex9_is_unorm;" << std::endl;
OS << " int tex10_is_unorm;" << std::endl;
OS << " int tex11_is_unorm;" << std::endl;
OS << " int tex12_is_unorm;" << std::endl;
OS << " int tex13_is_unorm;" << std::endl;
OS << " int tex14_is_unorm;" << std::endl;
OS << " int tex15_is_unorm;" << std::endl;
OS << "};" << std::endl;
}