From 54aeec7a8ff6b6e5d050637b6cce8df6d9a8b633 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sun, 13 May 2012 17:48:23 +0200 Subject: Dump the redundant "save textures" function. Use TextureCache's dumping feature instead. --- Source/Core/VideoCommon/Src/VertexManagerBase.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'Source/Core/VideoCommon/Src/VertexManagerBase.cpp') diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index 004b0f3cca..d66da30273 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -243,15 +243,6 @@ void VertexManager::Flush() { // 0s are probably for no manual wrapping needed. PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0); - - // TODO: - //if (g_ActiveConfig.iLog & CONF_SAVETEXTURES) - //{ - // // save the textures - // char strfile[255]; - // sprintf(strfile, "%stex%.3d_%d.tga", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_Config.iSaveTargetId, i); - // SaveTexture(strfile, GL_TEXTURE_2D, tentry->texture, tentry->w, tentry->h); - //} } else ERROR_LOG(VIDEO, "error loading texture"); -- cgit v1.2.3 From 99b202fd2eeac16e3c7776838e7b70c04a8a0883 Mon Sep 17 00:00:00 2001 From: nitsuja Date: Wed, 4 Jan 2012 00:42:22 -0800 Subject: savestate vertexmanager (base) since it affects VertexLoader::RunVertices which affects g_pVideoData --- Source/Core/VideoCommon/Src/VertexManagerBase.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Source/Core/VideoCommon/Src/VertexManagerBase.cpp') diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index d66da30273..b4e09a820e 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -308,3 +308,20 @@ shader_fail: ResetBuffer(); } #endif + +void VertexManager::DoState(PointerWrap& p) +{ + g_vertex_manager->vDoState(p); +} + +void VertexManager::DoStateShared(PointerWrap& p) +{ + p.DoPointer(s_pCurBufferPointer, LocalVBuffer); + p.DoArray(LocalVBuffer, MAXVBUFFERSIZE); + p.DoArray(TIBuffer, MAXIBUFFERSIZE); + p.DoArray(LIBuffer, MAXIBUFFERSIZE); + p.DoArray(PIBuffer, MAXIBUFFERSIZE); + + if (p.GetMode() == PointerWrap::MODE_READ) + Flushed = false; +} -- cgit v1.2.3 From b5ad382b075fc307d150dd8758f5aaadf7409be1 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 8 Jun 2012 00:18:04 +0200 Subject: Fast mipmaps deserves to die!! --- Source/Core/VideoCommon/Src/VertexManagerBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/Src/VertexManagerBase.cpp') diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index b4e09a820e..e38f7ff14e 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -236,7 +236,7 @@ void VertexManager::Flush() 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) && g_ActiveConfig.bUseNativeMips, + (tex.texMode0[i&3].min_filter & 3) && (tex.texMode0[i&3].min_filter != 8), (tex.texMode1[i&3].max_lod >> 4)); if (tentry) -- cgit v1.2.3 From 1dd6b978c1dafccbc8b7db9efb5c15d75596d1c8 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 25 Feb 2012 23:34:28 +0100 Subject: Remove "Disable Lighting". --- Source/Core/VideoCommon/Src/VertexManagerBase.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'Source/Core/VideoCommon/Src/VertexManagerBase.cpp') diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index e38f7ff14e..4118e3dcbd 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -159,16 +159,6 @@ void VertexManager::AddVertices(int primitive, int numVertices) void VertexManager::Flush() { - // Disable Lighting - // TODO - Is this a good spot for this code? - if (g_ActiveConfig.bDisableLighting) - { - for (u32 i = 0; i < xfregs.numChan.numColorChans; i++) - { - xfregs.alpha[i].enablelighting = false; - xfregs.color[i].enablelighting = false; - } - } g_vertex_manager->vFlush(); } -- cgit v1.2.3 From 2df0c31d13372bc29d488cf7e80d4adb9cf28b46 Mon Sep 17 00:00:00 2001 From: degasus Date: Fri, 21 Dec 2012 21:04:53 +0100 Subject: add invalid flag for BPStructs (fix issue 5790) this flag will be set on loading a state and checked before every rendering. --- Source/Core/VideoCommon/Src/VertexManagerBase.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/Core/VideoCommon/Src/VertexManagerBase.cpp') diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index 4118e3dcbd..23f355fe3b 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -9,6 +9,7 @@ #include "NativeVertexFormat.h" #include "TextureCacheBase.h" #include "RenderBase.h" +#include "BPStructs.h" #include "VertexManagerBase.h" #include "VideoConfig.h" @@ -159,6 +160,9 @@ void VertexManager::AddVertices(int primitive, int numVertices) void VertexManager::Flush() { + // loading a state will invalidate BP, so check for it + BPReload(); + g_vertex_manager->vFlush(); } -- cgit v1.2.3 From bd0abb3d2fe5047554bb6b87fa8e3f6aa3f42e0b Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 23 Dec 2012 13:32:23 +0100 Subject: revert last commit, add CheckInvalidState to VideoBackend --- Source/Core/VideoCommon/Src/VertexManagerBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoCommon/Src/VertexManagerBase.cpp') diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp index 23f355fe3b..5be72e4fcf 100644 --- a/Source/Core/VideoCommon/Src/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/VertexManagerBase.cpp @@ -161,7 +161,7 @@ void VertexManager::AddVertices(int primitive, int numVertices) void VertexManager::Flush() { // loading a state will invalidate BP, so check for it - BPReload(); + g_video_backend->CheckInvalidState(); g_vertex_manager->vFlush(); } -- cgit v1.2.3