diff --git a/plugins/GSdx/GPULocalMemory.cpp b/plugins/GSdx/GPULocalMemory.cpp index c7b3462c90..0218dcfc78 100644 --- a/plugins/GSdx/GPULocalMemory.cpp +++ b/plugins/GSdx/GPULocalMemory.cpp @@ -161,22 +161,22 @@ const void* GPULocalMemory::GetTexture(int tp, int tx, int ty) if((m_texture.valid[tp][ty] & flag) == 0) { - int bpp = 0; + // int bpp = 0; switch(tp) { case 0: ReadPage4(tx, ty, (uint8*)buff); - bpp = 4; + // bpp = 4; break; case 1: ReadPage8(tx, ty, (uint8*)buff); - bpp = 8; + // bpp = 8; break; case 2: case 3: ReadPage16(tx, ty, (uint16*)buff); - bpp = 16; + // bpp = 16; default: // FIXME: __assume(0); // vc9 generates bogus code in release mode break; diff --git a/plugins/GSdx/GPURendererSW.cpp b/plugins/GSdx/GPURendererSW.cpp index 5cc2cb10c8..addd2c4379 100644 --- a/plugins/GSdx/GPURendererSW.cpp +++ b/plugins/GSdx/GPURendererSW.cpp @@ -195,7 +195,7 @@ void GPURendererSW::VertexKick() int count = 0; - if(GSVertexSW* v = DrawingKick(count)) + if(DrawingKick(count)) { // TODO diff --git a/plugins/GSdx/GSLocalMemory.cpp b/plugins/GSdx/GSLocalMemory.cpp index f9f5541d40..10cb2433f5 100644 --- a/plugins/GSdx/GSLocalMemory.cpp +++ b/plugins/GSdx/GSLocalMemory.cpp @@ -1962,12 +1962,6 @@ void GSLocalMemory::SaveBMP(const string& fn, uint32 bp, uint32 bw, uint32 psm, TEX0.TBW = bw; TEX0.PSM = psm; - GIFRegTEXA TEXA; - - TEXA.AEM = 0; - TEXA.TA0 = 0; - TEXA.TA1 = 0x80; - readPixel rp = m_psm[psm].rp; uint8* p = (uint8*)bits; diff --git a/plugins/GSdx/GSRenderer.cpp b/plugins/GSdx/GSRenderer.cpp index 6d57891801..845adf3df7 100644 --- a/plugins/GSdx/GSRenderer.cpp +++ b/plugins/GSdx/GSRenderer.cpp @@ -126,7 +126,7 @@ bool GSRenderer::Merge(int field) m_regs->DISP[0].DISPFB.FBW == m_regs->DISP[1].DISPFB.FBW && m_regs->DISP[0].DISPFB.PSM == m_regs->DISP[1].DISPFB.PSM; - bool blurdetected = false; + // bool blurdetected = false; if(samesrc /*&& m_regs->PMODE.SLBG == 0 && m_regs->PMODE.MMOD == 1 && m_regs->PMODE.ALP == 0x80*/) { @@ -159,7 +159,7 @@ bool GSRenderer::Merge(int field) dr[0].bottom = bottom; dr[1].bottom = bottom; - blurdetected = true; + // blurdetected = true; } else if(dr[0].eq(dr[1]) && (fr[0].eq(fr[1] + GSVector4i(0, 1, 0, 1)) || fr[1].eq(fr[0] + GSVector4i(0, 1, 0, 1)))) { @@ -176,7 +176,7 @@ bool GSRenderer::Merge(int field) fr[0].top = fr[1].top = top; fr[0].bottom = fr[1].bottom = bottom; - blurdetected = true; + // blurdetected = true; } //printf("samesrc = %d blurdetected = %d\n",samesrc,blurdetected); } diff --git a/plugins/GSdx/GSRendererSW.cpp b/plugins/GSdx/GSRendererSW.cpp index 8fa64358b9..30d848e4aa 100644 --- a/plugins/GSdx/GSRendererSW.cpp +++ b/plugins/GSdx/GSRendererSW.cpp @@ -463,7 +463,7 @@ void GSRendererSW::Draw() // - GSScanlineGlobalData& gd = sd->global; + // GSScanlineGlobalData& gd = sd->global; uint32* fb_pages = NULL; uint32* zb_pages = NULL; diff --git a/plugins/GSdx/GSTextureCache.cpp b/plugins/GSdx/GSTextureCache.cpp index 161bffee64..1825e3343a 100644 --- a/plugins/GSdx/GSTextureCache.cpp +++ b/plugins/GSdx/GSTextureCache.cpp @@ -56,7 +56,7 @@ void GSTextureCache::RemoveAll() GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, const GSVector4i& r) { const GSLocalMemory::psm_t& psm = GSLocalMemory::m_psm[TEX0.PSM]; - const GSLocalMemory::psm_t& cpsm = psm.pal > 0 ? GSLocalMemory::m_psm[TEX0.CPSM] : psm; + //const GSLocalMemory::psm_t& cpsm = psm.pal > 0 ? GSLocalMemory::m_psm[TEX0.CPSM] : psm; GIFRegTEXA plainTEXA; @@ -423,7 +423,7 @@ void GSTextureCache::InvalidateLocalMem(GSOffset* o, const GSVector4i& r) { uint32 bp = o->bp; uint32 psm = o->psm; - uint32 bw = o->bw; + //uint32 bw = o->bw; // No depth handling please. if (psm == PSM_PSMZ32 || psm == PSM_PSMZ24 || psm == PSM_PSMZ16 || psm == PSM_PSMZ16S) @@ -573,7 +573,7 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con int tw = 1 << TEX0.TW; int th = 1 << TEX0.TH; - int tp = TEX0.TBW << 6; + //int tp = TEX0.TBW << 6; bool hack = false; diff --git a/plugins/zzogl-pg/opengl/ZZoglShaders.cpp b/plugins/zzogl-pg/opengl/ZZoglShaders.cpp index e6601274bc..2ca27a9873 100644 --- a/plugins/zzogl-pg/opengl/ZZoglShaders.cpp +++ b/plugins/zzogl-pg/opengl/ZZoglShaders.cpp @@ -75,9 +75,6 @@ extern HINSTANCE hInst; // Used in a logarithmic Z-test, as (1-o(1))/log(MAX_U32). const float g_filog32 = 0.999f / (32.0f * logf(2.0f)); -#ifdef _DEBUG -const static char* g_pTexTypes[] = { "32", "tex32", "clut32", "tex32to16", "tex16to8h" }; -#endif const char* g_pShaders[4] = { "full", "reduced", "accurate", "accurate-reduced" }; // ----------------- Global Variables @@ -905,6 +902,7 @@ FRAGMENTSHADER* ZZshLoadShadeEffect(int type, int texfilter, int fog, int testae if( pf->prog != NULL ) { #ifdef _DEBUG char str[255]; + const static char* g_pTexTypes[] = { "32", "tex32", "clut32", "tex32to16", "tex16to8h" }; sprintf(str, "Texture%s%d_%sPS", fog?"Fog":"", texfilter, g_pTexTypes[type]); pf->filename = str; #endif