diff options
| author | Mai <mathew1800@gmail.com> | 2022-11-23 04:40:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-23 04:40:53 +0000 |
| commit | cb232155d9160aad82a1cb4a9a13fda22d079293 (patch) | |
| tree | 59e78d80bd168ccc04849a4a9686239db384c4f6 /Source/Core/VideoCommon/VertexLoader.cpp | |
| parent | 31458259b67fe67d4feb0b2d425f629e3792fdf7 (diff) | |
| parent | e13094766d51c970deb2a00800e4dd033af25665 (diff) | |
Merge pull request #11298 from Pokechu22/vertexloader-no-DataReader
VertexLoader: Eliminate use of DataReader
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 8176027b45..c2d3c1bd29 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -6,7 +6,6 @@ #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "VideoCommon/DataReader.h" #include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexLoaderUtils.h" #include "VideoCommon/VertexLoader_Color.h" @@ -16,7 +15,7 @@ #include "VideoCommon/VideoCommon.h" // This pointer is used as the source/dst for all fixed function loader calls -u8* g_video_buffer_read_ptr; +const u8* g_video_buffer_read_ptr; u8* g_vertex_manager_write_ptr; static void PosMtx_ReadDirect_UByte(VertexLoader* loader) @@ -222,7 +221,7 @@ void VertexLoader::CompileVertexTranslator() WriteCall(VertexLoader_TextCoord::GetDummyFunction()); // important to get indices right! break; } - else if (m_VtxDesc.low.TexMatIdx[i]) + else if (m_VtxDesc.low.TexMatIdx[j]) { has_more = true; } @@ -249,10 +248,10 @@ void VertexLoader::WriteCall(TPipelineFunction func) m_PipelineStages[m_numPipelineStages++] = func; } -int VertexLoader::RunVertices(DataReader src, DataReader dst, int count) +int VertexLoader::RunVertices(const u8* src, u8* dst, int count) { - g_vertex_manager_write_ptr = dst.GetPointer(); - g_video_buffer_read_ptr = src.GetPointer(); + g_vertex_manager_write_ptr = dst; + g_video_buffer_read_ptr = src; m_numLoadedVertices += count; m_skippedVertices = 0; |