ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #912 from PCSX2/accurate-blending-issue-762 

gsdx-ogl: PrimitiveOverlap requires real rectangle
This commit is contained in:
Gregory Hainaut 2015-10-25 20:55:41 +01:00
parent 50e6306331 a8968257db
commit bba67fbd83
3 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/GSdx/GSRendererOGL.cpp
View File

@ -461,14 +461,48 @@ GSRendererOGL::PRIM_OVERLAP GSRendererOGL::PrimitiveOverlap()
// In order to speed up comparaison a boundind-box is accumulated. It removes a
// loop so code is much faster (check game virtua fighter). Besides it allow to check
// properly the Y order.
GSVector4i all(0);
for(size_t i = 0; i < count; i += 2) {
GSVector4i all;
//FIXME better vector operation
if (v[1].XYZ.Y < v[0].XYZ.Y) {
all.y = v[1].XYZ.Y;
all.w = v[0].XYZ.Y;
} else {
all.y = v[0].XYZ.Y;
all.w = v[1].XYZ.Y;
}
if (v[1].XYZ.X < v[0].XYZ.X) {
all.x = v[1].XYZ.X;
all.z = v[0].XYZ.X;
} else {
all.x = v[0].XYZ.X;
all.z = v[1].XYZ.X;
}
for(size_t i = 2; i < count; i += 2) {
GSVector4i sprite;
if (v[i+1].XYZ.Y < v[i].XYZ.Y) {
sprite = GSVector4i(v[i].XYZ.X, v[i+1].XYZ.Y, v[i+1].XYZ.X, v[i].XYZ.Y);
//FIXME better vector operation
if (v[i+1].XYZ.Y < v[i+0].XYZ.Y) {
sprite.y = v[i+1].XYZ.Y;
sprite.w = v[i+0].XYZ.Y;
} else {
sprite = GSVector4i(v[i].XYZ.X, v[i].XYZ.Y, v[i+1].XYZ.X, v[i+1].XYZ.Y);
sprite.y = v[i+0].XYZ.Y;
sprite.w = v[i+1].XYZ.Y;
}
if (v[i+1].XYZ.X < v[i+0].XYZ.X) {
sprite.x = v[i+1].XYZ.X;
sprite.z = v[i+0].XYZ.X;
} else {
sprite.x = v[i+0].XYZ.X;
sprite.z = v[i+1].XYZ.X;
}
// Be sure to get vertex in good order, otherwise .r* function doesn't
// work as expected.
ASSERT(sprite.x <= sprite.z);
ASSERT(sprite.y <= sprite.w);
ASSERT(all.x <= all.z);
ASSERT(all.y <= all.w);
if (all.rintersect(sprite).rempty()) {
all = all.runion(sprite);
} else {

7
plugins/GSdx/res/glsl/tfx_fs.glsl
View File

@ -236,6 +236,13 @@ vec4 sample_color(vec2 st, float q)
{
uv = st.xyxy + HalfTexel;
dd = fract(uv.xy * WH.zw);
#if (PS_FST == 0)
// Background in Shin Megami Tensei Lucifers
// I suspect that uv isn't a standard number, so fract is outside of the [0;1] range
// Note: it is free on GPU but let's do it only for float coordinate
// Strangely Dx doesn't suffer from this issue.
dd = clamp(dd, vec2(0.0f), vec2(1.0f));
#endif
}
else
{

7
plugins/GSdx/res/glsl_source.h
View File

@ -1140,6 +1140,13 @@ static const char* tfx_fs_all_glsl =
" {\n"
" uv = st.xyxy + HalfTexel;\n"
" dd = fract(uv.xy * WH.zw);\n"
"#if (PS_FST == 0)\n"
" // Background in Shin Megami Tensei Lucifers\n"
" // I suspect that uv isn't a standard number, so fract is outside of the [0;1] range\n"
" // Note: it is free on GPU but let's do it only for float coordinate\n"
" // Strangely Dx doesn't suffer from this issue.\n"
" dd = clamp(dd, vec2(0.0f), vec2(1.0f));\n"
"#endif\n"
" }\n"
" else\n"
" {\n"