From 2d8515c0cf754806dc38222c4461053e12df1194 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 9 Dec 2013 23:49:09 +0100 Subject: [PATCH] VideoCommon: remove outdated copy of OGL::VertexManager::vFlush --- .../VideoCommon/Src/VertexManagerBase.cpp | 134 +----------------- 1 file changed, 1 insertion(+), 133 deletions(-) diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index b586ad1a99..b5285dd0e2 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -149,144 +149,12 @@ void VertexManager::Flush() VideoFifo_CheckEFBAccess(); + // TODO: need to merge more stuff into VideoCommon g_vertex_manager->vFlush(); g_vertex_manager->ResetBuffer(); } -// TODO: need to merge more stuff into VideoCommon to use this -#if (0) -void VertexManager::Flush() -{ -#if defined(_DEBUG) || defined(DEBUGFAST) - PRIM_LOG("frame%d:\n texgen=%d, numchan=%d, dualtex=%d, ztex=%d, cole=%d, alpe=%d, ze=%d", g_ActiveConfig.iSaveTargetId, xfregs.numTexGens, - xfregs.nNumChans, (int)xfregs.bEnableDualTexTransform, bpmem.ztex2.op, - bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate, bpmem.zmode.updateenable); - - for (int i = 0; i < xfregs.nNumChans; ++i) - { - LitChannel* ch = &xfregs.colChans[i].color; - PRIM_LOG("colchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc); - ch = &xfregs.colChans[i].alpha; - PRIM_LOG("alpchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc); - } - - for (int i = 0; i < xfregs.numTexGens; ++i) - { - TexMtxInfo tinfo = xfregs.texcoords[i].texmtxinfo; - if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) tinfo.hex &= 0x7ff; - if (tinfo.texgentype != XF_TEXGEN_REGULAR) tinfo.projection = 0; - - PRIM_LOG("txgen%d: proj=%d, input=%d, gentype=%d, srcrow=%d, embsrc=%d, emblght=%d, postmtx=%d, postnorm=%d", - i, tinfo.projection, tinfo.inputform, tinfo.texgentype, tinfo.sourcerow, tinfo.embosssourceshift, tinfo.embosslightshift, - xfregs.texcoords[i].postmtxinfo.index, xfregs.texcoords[i].postmtxinfo.normalize); - } - - PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphafunc=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages, - bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff); -#endif - - u32 usedtextures = 0; - for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i) - if (bpmem.tevorders[i / 2].getEnable(i & 1)) - usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1); - - if (bpmem.genMode.numindstages > 0) - for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i) - if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages) - usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt); - - for (u32 i = 0; i < 8; ++i) - { - if (usedtextures & (1 << i)) - { - // TODO: - //glActiveTexture(GL_TEXTURE0 + i); - - Renderer::SetSamplerState(i & 3, i >> 2); - FourTexUnits &tex = bpmem.tex[i >> 2]; - - TCacheEntry::TCacheEntryBase* tentry = TextureCache::Load(i, - (tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5, - tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1, - tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9, - tex.texTlut[i&3].tlut_format, - (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), - (tex.texMode1[i&3].max_lod >> 4)); - - if (tentry) - { - // 0s are probably for no manual wrapping needed. - PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0); - } - else - { - ERROR_LOG(VIDEO, "Error loading texture"); - } - } - } - - // set global constants - VertexShaderManager::SetConstants(); - PixelShaderManager::SetConstants(); - - // finally bind - if (false == PixelShaderCache::SetShader(false, g_nativeVertexFmt->m_components)) - return; - if (false == VertexShaderCache::SetShader(g_nativeVertexFmt->m_components)) - return; - - const int stride = g_nativeVertexFmt->GetVertexStride(); - //if (g_nativeVertexFmt) - g_nativeVertexFmt->SetupVertexPointers(); - - g_renderer->ResumePixelPerf(false); - g_vertex_manager->Draw(stride, false); - g_renderer->PausePixelPerf(false); - - // run through vertex groups again to set alpha - if (false == g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate) - { - if (false == PixelShaderCache::SetShader(true, g_nativeVertexFmt->m_components)) - return; - - g_vertex_manager->Draw(stride, true); - } - - // TODO: - //IndexGenerator::Start(TIBuffer, LIBuffer, PIBuffer); - -#if defined(_DEBUG) || defined(DEBUGFAST) - if (g_ActiveConfig.iLog & CONF_SAVESHADERS) - { - // save the shaders - char strfile[255]; - sprintf(strfile, "%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId); - std::ofstream fps; - OpenFStream(fps, strfile, std::ios_base::out); - fps << ps->strprog.c_str(); - sprintf(strfile, "%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId); - std::ofstream fvs; - OpenFStream(fvs, strfile, std::ios_base::out); - fvs << vs->strprog.c_str(); - } - - if (g_ActiveConfig.iLog & CONF_SAVETARGETS) - { - char str[128]; - sprintf(str, "%starg%.3d.tga", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId); - TargetRectangle tr; - tr.left = 0; - tr.right = Renderer::GetTargetWidth(); - tr.top = 0; - tr.bottom = Renderer::GetTargetHeight(); - Renderer::SaveRenderTarget(str, tr); - } -#endif - ++g_Config.iSaveTargetId; -} -#endif - void VertexManager::DoState(PointerWrap& p) { g_vertex_manager->vDoState(p);