mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-28 12:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl: Fix unnormalized coord sampling.

Browse Source
This commit is contained in:
Vincent Lejeune 2016-03-29 17:04:21 +02:00
parent f712b8aca4
commit 17c4b2387e
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vulkan/Vulkan-LoaderAndValidationLayers

@ -1 +1 @@
Subproject commit ec513f89f9354394fec465448a2838f106777640 Subproject commit 1affe90f0ec7f9bccb6841a56a2a5b66861efe6a

6
rpcs3/Emu/RSX/GL/GLCommonDecompiler.cpp
View File

@ -47,11 +47,11 @@ std::string getFunctionImpl(FUNCTION f)
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_SAMPLE2D: case FUNCTION::FUNCTION_TEXTURE_SAMPLE2D:
return "texture($t, $0.xy)"; 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, $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, $1.x)"; return "textureLod($t, $0.xy * $t_coord_scale, $1.x)";
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:

24
rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp
View File

@ -85,9 +85,6 @@ void GLFragmentDecompilerThread::insertConstants(std::stringstream & OS)
std::string samplerType = PT.type; std::string samplerType = PT.type;
int index = atoi(&PI.name.data()[3]); int index = atoi(&PI.name.data()[3]);
if (m_prog.unnormalized_coords & (1 << index))
samplerType = "sampler2DRect";
OS << "uniform " << samplerType << " " << PI.name << ";" << std::endl; OS << "uniform " << samplerType << " " << PI.name << ";" << std::endl;
} }
} }
@ -163,6 +160,27 @@ void GLFragmentDecompilerThread::insertMainStart(std::stringstream & OS)
OS << " vec4 ssa = gl_FrontFacing ? vec4(1.) : vec4(-1.);\n"; OS << " vec4 ssa = gl_FrontFacing ? vec4(1.) : vec4(-1.);\n";
for (const ParamType& PT : m_parr.params[PF_PARAM_UNIFORM])
{
if (PT.type != "sampler2D")
continue;
for (const ParamItem& PI : PT.items)
{
std::string samplerType = PT.type;
int index = atoi(&PI.name.data()[3]);
if (m_prog.unnormalized_coords & (1 << index))
{
OS << "vec2 tex" << index << "_coord_scale = 1. / textureSize(" << PI.name << ", 0);\n";
}
else
{
OS << "vec2 tex" << index << "_coord_scale = vec2(1.);\n";
}
}
}
// search if there is fogc in inputs // search if there is fogc in inputs
for (const ParamType& PT : m_parr.params[PF_PARAM_IN]) for (const ParamType& PT : m_parr.params[PF_PARAM_IN])
{ {