(view as text)
diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp
index 6553a56..75ca01a 100644
--- a/Source/Core/VideoBackends/D3D/VertexManager.cpp
+++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp
@@ -193,45 +193,6 @@ void VertexManager::Draw(UINT stride)
void VertexManager::vFlush()
{
- 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 (unsigned int i = 0; i < 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 (unsigned int i = 0; i < 8; i++)
- {
- if (usedtextures & (1 << i))
- {
- g_renderer->SetSamplerState(i & 3, i >> 2);
- const FourTexUnits &tex = bpmem.tex[i >> 2];
- const TextureCache::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) != 0),
- (tex.texMode1[i&3].max_lod + 0xf) / 0x10,
- (tex.texImage1[i&3].image_type != 0));
-
- if (tentry)
- {
- // 0s are probably for no manual wrapping needed.
- PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
- }
- else
- ERROR_LOG(VIDEO, "error loading texture");
- }
- }
-
- // set global constants
- VertexShaderManager::SetConstants();
- PixelShaderManager::SetConstants();
-
bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate &&
bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp
index c9d6935..274c9b9 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp
@@ -125,36 +125,6 @@ void VertexManager::Draw(u32 stride)
void VertexManager::vFlush()
{
-#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.numTexGen.numTexGens,
- xfregs.numChan.numColorChans, xfregs.dualTexTrans.enabled, bpmem.ztex2.op,
- bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate, bpmem.zmode.updateenable);
-
- for (unsigned int i = 0; i < xfregs.numChan.numColorChans; ++i)
- {
- LitChannel* ch = &xfregs.color[i];
- 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.alpha[i];
- 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 (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
- {
- TexMtxInfo tinfo = xfregs.texMtxInfo[i];
- 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.postMtxInfo[i].index, xfregs.postMtxInfo[i].normalize);
- }
-
- PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphatest=0x%x", bpmem.genMode.numtevstages+1, bpmem.genMode.numindstages,
- bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff);
-#endif
-
- (void)GL_REPORT_ERROR();
-
GLVertexFormat *nativeVertexFmt = (GLVertexFormat*)g_nativeVertexFmt;
u32 stride = nativeVertexFmt->GetVertexStride();
@@ -166,41 +136,6 @@ void VertexManager::vFlush()
PrepareDrawBuffers(stride);
GL_REPORT_ERRORD();
- 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))
- {
- g_renderer->SetSamplerState(i % 4, i / 4);
- FourTexUnits &tex = bpmem.tex[i >> 2];
- TextureCache::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,
- (0 != (tex.texMode0[i&3].min_filter & 3)),
- (tex.texMode1[i&3].max_lod + 0xf) / 0x10,
- (0 != tex.texImage1[i&3].image_type));
-
- if (tentry)
- {
- // 0s are probably for no manual wrapping needed.
- PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
- }
- else
- ERROR_LOG(VIDEO, "Error loading texture");
- }
- }
-
bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass && bpmem.dstalpha.enable && bpmem.blendmode.alphaupdate
&& bpmem.zcontrol.pixel_format == PIXELFMT_RGBA6_Z24;
@@ -226,9 +161,7 @@ void VertexManager::vFlush()
ProgramShaderCache::SetShader(DSTALPHA_NONE,g_nativeVertexFmt->m_components);
}
- // set global constants
- VertexShaderManager::SetConstants();
- PixelShaderManager::SetConstants();
+ // upload global constants
ProgramShaderCache::UploadConstants();
// setup the pointers
@@ -247,7 +180,7 @@ void VertexManager::vFlush()
ProgramShaderCache::SetShader(DSTALPHA_ALPHA_PASS,g_nativeVertexFmt->m_components);
if (!g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{
- // Need to set these again, if we don't support UBO
+ // Need to upload these again, if we don't support UBO
ProgramShaderCache::UploadConstants();
}
diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp
index bce4af4..1238aa1 100644
--- a/Source/Core/VideoCommon/VertexManagerBase.cpp
+++ b/Source/Core/VideoCommon/VertexManagerBase.cpp
@@ -167,6 +167,73 @@ void VertexManager::Flush()
VideoFifo_CheckEFBAccess();
+#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.numTexGen.numTexGens,
+ xfregs.numChan.numColorChans, xfregs.dualTexTrans.enabled, bpmem.ztex2.op,
+ bpmem.blendmode.colorupdate, bpmem.blendmode.alphaupdate, bpmem.zmode.updateenable);
+
+ for (unsigned int i = 0; i < xfregs.numChan.numColorChans; ++i)
+ {
+ LitChannel* ch = &xfregs.color[i];
+ 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.alpha[i];
+ 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 (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+ {
+ TexMtxInfo tinfo = xfregs.texMtxInfo[i];
+ 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.postMtxInfo[i].index, xfregs.postMtxInfo[i].normalize);
+ }
+
+ PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphatest=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 < bpmem.genMode.numtevstages + 1u; ++i)
+ if (bpmem.tevorders[i / 2].getEnable(i & 1))
+ usedtextures |= 1 << bpmem.tevorders[i/2].getTexMap(i & 1);
+
+ if (bpmem.genMode.numindstages > 0)
+ for (unsigned int i = 0; i < bpmem.genMode.numtevstages + 1u; ++i)
+ if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
+ usedtextures |= 1 << bpmem.tevindref.getTexMap(bpmem.tevind[i].bt);
+
+ for (unsigned int i = 0; i < 8; i++)
+ {
+ if (usedtextures & (1 << i))
+ {
+ g_renderer->SetSamplerState(i & 3, i >> 2);
+ const FourTexUnits &tex = bpmem.tex[i >> 2];
+ const TextureCache::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) != 0),
+ (tex.texMode1[i&3].max_lod + 0xf) / 0x10,
+ (tex.texImage1[i&3].image_type != 0));
+
+ if (tentry)
+ {
+ // 0s are probably for no manual wrapping needed.
+ PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
+ }
+ else
+ ERROR_LOG(VIDEO, "error loading texture");
+ }
+ }
+
+ // set global constants
+ VertexShaderManager::SetConstants();
+ PixelShaderManager::SetConstants();
+
// TODO: need to merge more stuff into VideoCommon
g_vertex_manager->vFlush();