diff --git a/plugins/GSdx/Renderers/HW/GSHwHack.cpp b/plugins/GSdx/Renderers/HW/GSHwHack.cpp index f15fcebba7..927e409c7a 100644 --- a/plugins/GSdx/Renderers/HW/GSHwHack.cpp +++ b/plugins/GSdx/Renderers/HW/GSHwHack.cpp @@ -74,16 +74,15 @@ bool GSC_Bully(const GSFrameInfo& fi, int& skip) return true; } -// Potentially partially dx only bool GSC_DBZBT2(const GSFrameInfo& fi, int& skip) { if(skip == 0) { - if((g_crc_region == CRC::EU || Aggressive || !s_nativeres) && !fi.TME && (fi.FBP == 0x02a00 || fi.FBP == 0x03000) && fi.FPSM == PSM_PSMCT16) + if((Aggressive || !s_nativeres) && !fi.TME && (fi.FBP == 0x02a00 || fi.FBP == 0x03000) && fi.FPSM == PSM_PSMCT16) { // Character outlines. // Glow/blur effect. Causes ghosting on upscaled resolution. - // Don't enable hack on native res if crc(ntsc only) is below aggressive. + // Don't enable hack on native res if crc is below aggressive. skip = 10; } } @@ -91,16 +90,15 @@ bool GSC_DBZBT2(const GSFrameInfo& fi, int& skip) return true; } -// Potentially partially dx only bool GSC_DBZBT3(const GSFrameInfo& fi, int& skip) { if(skip == 0) { - if((g_crc_region == CRC::EU || Aggressive || !s_nativeres) && fi.TME && (fi.FBP == 0x03400 || fi.FBP == 0x02e00) && fi.FPSM == fi.TPSM && fi.TBP0 == 0x03f00 && fi.TPSM == PSM_PSMCT32) + if((Aggressive || !s_nativeres) && fi.TME && (fi.FBP == 0x03400 || fi.FBP == 0x02e00) && fi.FPSM == fi.TPSM && fi.TBP0 == 0x03f00 && fi.TPSM == PSM_PSMCT32) { // Ghosting/Blur effect. Upscaling issue. // Can be fixed with TC X,Y offsets. - // Don't enable hack on native res if crc(ntsc only) is below aggressive. + // Don't enable hack on native res if crc is below aggressive. skip = 3; } } @@ -159,13 +157,13 @@ bool GSC_DemonStone(const GSFrameInfo& fi, int& skip) return true; } -// Channel effect not properly supported yet bool GSC_GiTS(const GSFrameInfo& fi, int& skip) { if(skip == 0) { if(fi.TME && fi.FBP == 0x03000 && fi.FPSM == PSM_PSMCT32 && fi.TPSM == PSM_PSMT8) { + // Channel effect not properly supported yet skip = 9; } } diff --git a/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp b/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp index 0d59aef64e..50c8b83a22 100644 --- a/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp +++ b/plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp @@ -905,7 +905,7 @@ GSRendererOGL::PRIM_OVERLAP GSRendererOGL::PrimitiveOverlap() } #endif - //fprintf(stderr, "%d: Yes, code can be optimized (draw of %d vertices)\n", s_n, count); + fprintf(stderr, "%d: Yes, code can be optimized (draw of %d vertices)\n", s_n, count); return overlap; } diff --git a/plugins/GSdx/res/tfx.fx b/plugins/GSdx/res/tfx.fx index a81848a53f..5c917f6da8 100644 --- a/plugins/GSdx/res/tfx.fx +++ b/plugins/GSdx/res/tfx.fx @@ -81,7 +81,7 @@ struct PS_OUTPUT Texture2D Texture : register(t0); Texture2D Palette : register(t1); -Texture2D RtSample : register(t3); +Texture2D RtSampler : register(t3); Texture2D RawTexture : register(t4); SamplerState TextureSampler : register(s0); SamplerState PaletteSampler : register(s1); @@ -920,7 +920,7 @@ PS_OUTPUT ps_main(PS_INPUT input) if (PS_FBMASK) { - float4 rt = RtSample.Load(int3(input.p.xy, 0)); + float4 rt = RtSampler.Load(int3(input.p.xy, 0)); uint4 denorm_rt = uint4(rt * 255.0f + 0.5f); uint4 denorm_c = uint4(c * 255.0f + 0.5f); c = float4((denorm_c & ~FbMask) | (denorm_rt & FbMask)) / 255.0f;