libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2025-01-02 07:18:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GSdx: More work on the effects. Found out I need to handle depth stencils ><

Browse Source 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2111 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2009-11-01 11:42:12 +00:00
parent 4adb0d1e8d
commit 9ccc7b2465
3 changed files with 79 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GSdx/GSDevice.cpp
View File

@ -144,8 +144,8 @@ void GSDevice::Recycle(GSTexture* t)
if(t)
{
m_pool.push_front(t);
while(m_pool.size() > 600)
//printf("%d\n",m_pool.size());
while(m_pool.size() > 300)
{
delete m_pool.back();

22
plugins/GSdx/GSRendererDX.h
View File

@ -179,9 +179,9 @@ public:
float oy = (float)(int)context->XYOFFSET.OFY + m_pixoff_y;
float ox2 = 2.0f * m_pixelcenter.x / rt->GetWidth();
float oy2 = 2.0f * m_pixelcenter.y / rt->GetHeight();
vs_cb.VertexScale = GSVector4(sx, -sy, 1.0f / UINT_MAX, 0.0f);
vs_cb.VertexOffset = GSVector4(ox * sx + ox2 + 1, -(oy * sy + oy2 + 1), 0.0f, -1.0f);
float adjust_offset = 0.0f;
float adjust_size = 0.0f;
// gs
@ -247,10 +247,20 @@ public:
int th = (int)(1 << context->TEX0.TH);
GSVector4 WH(tw, th, w, h);
//if (w > 0 && w < 129) { adjust_size = 0.0001f; adjust_offset = -0.000000f; } //0.07f for ar tonelico but max 0.007f for shadow hearts)
//else if (w > 128 && w < 257) { adjust_size = 0.0010f; adjust_offset = -0.000000f; } //0.007f; WA games want stuffx at 0.52
//else if (w > 256 && w < 513) { adjust_size = 0.4000f; adjust_offset = -0.000000f; } //offset -0.0005f;
//else if (w > 512 && w < 1025){ adjust_size = 0.4000f; adjust_offset = -0.000000f; } //TotA battle blur wants -0.000015f, but that's too much for WA games.
//adjust_offset = -0.001f; } //0.07f for ar tonelico but max 0.007f for shadow hearts)
//adjust_offset = 0.0002f; } //0.007f;
//adjust_offset = -0.0005f; } //offset -0.0005f;
//adjust_offset = -0.000006f; } //TotA battle blur wants -0.000015f, but that's too much for WA games.
if(PRIM->FST)
{
vs_cb.TextureScale = GSVector4(1.0f / 16) / WH.xyxy();
vs_cb.TextureScale = GSVector4((1.0f / 16)) / (WH.xyxy() + adjust_size);
ps_sel.fst = 1;
}
@ -273,7 +283,9 @@ public:
{
ps_sel.tfx = 4;
}
vs_cb.VertexScale = GSVector4(sx, -sy, 1.0f / UINT_MAX, 0.0f);
vs_cb.VertexOffset = GSVector4(ox * sx + ox2 + 1 + adjust_offset, -(oy * sy + oy2 + 1 + adjust_offset), 0.0f, -1.0f);
// rs
GSVector4i scissor = GSVector4i(GSVector4(rt->GetScale()).xyxy() * context->scissor.in).rintersect(GSVector4i(rt->GetSize()).zwxy());

94
plugins/GSdx/GSTextureCache.cpp
View File

@ -724,7 +724,8 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
return src;
}
//WIP fog / blur / depth of field handling.
// //WIP fog / blur / depth of field handling.
//GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, Target* dst)
//{
// Source* src = new Source(m_renderer);
@ -758,17 +759,14 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
//
// src->m_target = true;
//
// dst->Update();
//
// if(dst->m_type != RenderTarget)
// {
// // TODO
//
// delete src;
//
// return NULL;
// //src->m_target = false; //no idea what depth stencil needs ><
// //printf("type stencil\n");
// }
//
// dst->Update();
//
// GSTexture* tmp = NULL;
//
// if(dst->m_texture->IsMSAA())
@ -788,8 +786,15 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
// //Hacked up to figure out how fog / depth / blur effects are done. Works in Xenosaga 3.
// if ((tw == 1024 && th == 1024) && dst->m_TEX0.TBW != TEX0.TBW){
//
// src->m_texture = m_renderer->m_dev->CreateRenderTarget(dstsize.x, dstsize.y, false);
// GSVector4 size = GSVector4(dstsize).xyxy() * 2; // * 2 to force the effect overlay into the right position
// if(dst->m_type != RenderTarget)
// {
// src->m_texture = m_renderer->m_dev->CreateDepthStencil(dstsize.x, dstsize.y, false);
// }
// else{
// src->m_texture = m_renderer->m_dev->CreateRenderTarget(dstsize.x, dstsize.y, false);
// }
//
// GSVector4 size = GSVector4(dstsize).xyxy()*2 ; // * 2 to force the effect overlay into the right position
// GSVector4 scale = GSVector4(dst->m_texture->GetScale()).xyxy(); //Not needed right now, but good for testing
//
// GSVector4 br (0.0f, 0.0f, 1024.0f, 1024.0f); // entire RT
@ -797,23 +802,30 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
// GSVector4 dr = br * scale;
//
// m_renderer->m_dev->StretchRect(dst->m_texture, sr, src->m_texture, dr);
//
// }
// // pitch conversion //total mess right now, don't touch :p
// // pitch conversion
// else if(dst->m_TEX0.TBW != TEX0.TBW) // && dst->m_TEX0.PSM == TEX0.PSM
// {
// // sfex3 uses this trick (bw: 10 -> 5, wraps the right side below the left)
//
// // ASSERT(dst->m_TEX0.TBW > TEX0.TBW); // otherwise scale.x need to be reduced to make the larger texture fit (TODO)
//
// src->m_texture = m_renderer->m_dev->CreateRenderTarget(dstsize.x, dstsize.y, false);
//
// if(dst->m_type != RenderTarget)
// {
// src->m_texture = m_renderer->m_dev->CreateDepthStencil(dstsize.x, dstsize.y, false);
// }
// else{
// src->m_texture = m_renderer->m_dev->CreateRenderTarget(dstsize.x, dstsize.y, false);
// }
//
// GSVector4 size = GSVector4(dstsize).xyxy();
// GSVector4 scale = GSVector4(dst->m_texture->GetScale()).xyxy();
//
// if (dst->m_TEX0.TBW < TEX0.TBW) // otherwise scale.x need to be reduced to make the larger texture fit
// {
// // scale.x = ((float)dst->m_TEX0.TBW / (float)TEX0.TBW) ;
// // printf("scale.x = %f \n", scale.x);
// scale.x = ((float)dst->m_TEX0.TBW / (float)TEX0.TBW) ;
// //printf("scale.x = %f \n", scale.x);
// }
//
// int blockWidth = 64;
@ -855,30 +867,34 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
// return false;
// }
// }
//
// // width/height conversion
//
// GSVector2 scale = dst->m_texture->GetScale();
//
// GSVector4 dr(0, 0, w, h);
//
// if(w > dstsize.x)
// {
// scale.x = (float)dstsize.x / tw;
// dr.z = (float)dstsize.x * scale.x / dst->m_texture->GetScale().x;
// w = dstsize.x;
// }
// //if(dst->m_type != RenderTarget) {
// if(w > dstsize.x)
// {
// scale.x = (float)dstsize.x / tw;
// dr.z = (float)dstsize.x * scale.x / dst->m_texture->GetScale().x;
// w = dstsize.x;
// }
//
// if(h > dstsize.y)
// {
// scale.y = (float)dstsize.y / th;
// dr.w = (float)dstsize.y * scale.y / dst->m_texture->GetScale().y;
// h = dstsize.y;
// }
// if(h > dstsize.y)
// {
// scale.y = (float)dstsize.y / th;
// dr.w = (float)dstsize.y * scale.y / dst->m_texture->GetScale().y;
// h = dstsize.y;
// }
// //}
//
// GSVector4 sr(0, 0, w, h);
//
// GSTexture* st = src->m_texture ? src->m_texture : dst->m_texture;
// GSTexture* dt = m_renderer->m_dev->CreateRenderTarget(w, h, false);
// GSTexture* dt;
// if(dst->m_type == RenderTarget) dt = m_renderer->m_dev->CreateRenderTarget(w, h, false);
// else dt = m_renderer->m_dev->CreateDepthStencil(w, h, false);
//
// if(!src->m_texture)
// {
@ -909,8 +925,7 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
// switch(TEX0.PSM)
// {
// default:
// // Note: this assertion triggers in Xenosaga2 after the first intro scenes, when
// // gameplay first begins (in the city).
// // Unhandled texture format
// ASSERT(0);
// case PSM_PSMCT32:
// src->m_fmt = FMT_32;
@ -922,14 +937,25 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
// case PSM_PSMCT16S:
// src->m_fmt = FMT_16;
// break;
//
// case PSM_PSMZ32:
// src->m_fmt = FMT_32;
// break;
// case PSM_PSMZ24:
// src->m_fmt = FMT_24;
// break;
// case PSM_PSMZ16:
// src->m_fmt = FMT_16;
// break;
//
// case PSM_PSMT8H:
// src->m_fmt = FMT_8H;
// src->m_palette = m_renderer->m_dev->CreateTexture(256, 1);
// break;
// case PSM_PSMT8:
// //Not sure, this wasn't handled at all.
// //Xenosaga 2 and 3 use it, Tales of Legendia as well.
// //It's always used for fog like effects.
// //Not sure, this wasn't handled at all.
// //Xenosaga 2 and 3 use it, Tales of Legendia as well.
// //It's always used for fog like effects.
// src->m_fmt = FMT_8;
// src->m_palette = m_renderer->m_dev->CreateTexture(256, 1);
// break;