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

gsdx: remove/comment unused variable

This commit is contained in:
Gregory Hainaut 2014-04-14 20:25:02 +02:00
parent 4d6d5c870c
commit 5087d13de8
7 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/GSdx/GPULocalMemory.cpp
View File

@ -161,22 +161,22 @@ const void* GPULocalMemory::GetTexture(int tp, int tx, int ty)
if((m_texture.valid[tp][ty] & flag) == 0) if((m_texture.valid[tp][ty] & flag) == 0)
{ {
int bpp = 0; // int bpp = 0;
switch(tp) switch(tp)
{ {
case 0: case 0:
ReadPage4(tx, ty, (uint8*)buff); ReadPage4(tx, ty, (uint8*)buff);
bpp = 4; // bpp = 4;
break; break;
case 1: case 1:
ReadPage8(tx, ty, (uint8*)buff); ReadPage8(tx, ty, (uint8*)buff);
bpp = 8; // bpp = 8;
break; break;
case 2: case 2:
case 3: case 3:
ReadPage16(tx, ty, (uint16*)buff); ReadPage16(tx, ty, (uint16*)buff);
bpp = 16; // bpp = 16;
default: default:
// FIXME: __assume(0); // vc9 generates bogus code in release mode // FIXME: __assume(0); // vc9 generates bogus code in release mode
break; break;

2
plugins/GSdx/GPURendererSW.cpp
View File

@ -195,7 +195,7 @@ void GPURendererSW::VertexKick()
int count = 0; int count = 0;
if(GSVertexSW* v = DrawingKick(count)) if(DrawingKick(count))
{ {
// TODO // TODO

6
plugins/GSdx/GSLocalMemory.cpp
View File

@ -1962,12 +1962,6 @@ void GSLocalMemory::SaveBMP(const string& fn, uint32 bp, uint32 bw, uint32 psm,
TEX0.TBW = bw; TEX0.TBW = bw;
TEX0.PSM = psm; TEX0.PSM = psm;
GIFRegTEXA TEXA;
TEXA.AEM = 0;
TEXA.TA0 = 0;
TEXA.TA1 = 0x80;
readPixel rp = m_psm[psm].rp; readPixel rp = m_psm[psm].rp;
uint8* p = (uint8*)bits; uint8* p = (uint8*)bits;

6
plugins/GSdx/GSRenderer.cpp
View File

@ -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.FBW == m_regs->DISP[1].DISPFB.FBW &&
m_regs->DISP[0].DISPFB.PSM == m_regs->DISP[1].DISPFB.PSM; 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*/) 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[0].bottom = bottom;
dr[1].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)))) 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].top = fr[1].top = top;
fr[0].bottom = fr[1].bottom = bottom; fr[0].bottom = fr[1].bottom = bottom;
blurdetected = true; // blurdetected = true;
} }
//printf("samesrc = %d blurdetected = %d\n",samesrc,blurdetected); //printf("samesrc = %d blurdetected = %d\n",samesrc,blurdetected);
} }

2
plugins/GSdx/GSRendererSW.cpp
View File

@ -463,7 +463,7 @@ void GSRendererSW::Draw()
// //
GSScanlineGlobalData& gd = sd->global; // GSScanlineGlobalData& gd = sd->global;
uint32* fb_pages = NULL; uint32* fb_pages = NULL;
uint32* zb_pages = NULL; uint32* zb_pages = NULL;

6
plugins/GSdx/GSTextureCache.cpp
View File

@ -56,7 +56,7 @@ void GSTextureCache::RemoveAll()
GSTextureCache::Source* GSTextureCache::LookupSource(const GIFRegTEX0& TEX0, const GIFRegTEXA& TEXA, const GSVector4i& r) 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& 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; GIFRegTEXA plainTEXA;
@ -423,7 +423,7 @@ void GSTextureCache::InvalidateLocalMem(GSOffset* o, const GSVector4i& r)
{ {
uint32 bp = o->bp; uint32 bp = o->bp;
uint32 psm = o->psm; uint32 psm = o->psm;
uint32 bw = o->bw; //uint32 bw = o->bw;
// No depth handling please. // No depth handling please.
if (psm == PSM_PSMZ32 || psm == PSM_PSMZ24 || psm == PSM_PSMZ16 || psm == PSM_PSMZ16S) 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 tw = 1 << TEX0.TW;
int th = 1 << TEX0.TH; int th = 1 << TEX0.TH;
int tp = TEX0.TBW << 6; //int tp = TEX0.TBW << 6;
bool hack = false; bool hack = false;

4
plugins/zzogl-pg/opengl/ZZoglShaders.cpp
View File

@ -75,9 +75,6 @@ extern HINSTANCE hInst;
// Used in a logarithmic Z-test, as (1-o(1))/log(MAX_U32). // Used in a logarithmic Z-test, as (1-o(1))/log(MAX_U32).
const float g_filog32 = 0.999f / (32.0f * logf(2.0f)); 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" }; const char* g_pShaders[4] = { "full", "reduced", "accurate", "accurate-reduced" };
// ----------------- Global Variables // ----------------- Global Variables
@ -905,6 +902,7 @@ FRAGMENTSHADER* ZZshLoadShadeEffect(int type, int texfilter, int fog, int testae
if( pf->prog != NULL ) { if( pf->prog != NULL ) {
#ifdef _DEBUG #ifdef _DEBUG
char str[255]; 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]); sprintf(str, "Texture%s%d_%sPS", fog?"Fog":"", texfilter, g_pTexTypes[type]);
pf->filename = str; pf->filename = str;
#endif #endif