piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor change to ease video plugin merging. Made static NativeVertexFormat::Create function into a virtual function of VertexManager. I believe this is the last bit of code which is only declared in VideoCommon and defined in each of the plugins.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6479 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-11-26 09:25:08 +00:00
parent 2e59d26133
commit e6658d5339
9 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/VideoCommon/Src/NativeVertexFormat.h
View File

@ -99,15 +99,14 @@ public:
int GetVertexStride() const { return vertex_stride; }
static NativeVertexFormat *Create();
// TODO: move these in under private:
// TODO: move this under private:
u32 m_components; // VB_HAS_X. Bitmask telling what vertex components are present.
u32 vertex_stride;
protected:
// Let subclasses construct.
NativeVertexFormat() {}
u32 vertex_stride;
};
#endif // _NATIVEVERTEXFORMAT_H

2
Source/Core/VideoCommon/Src/VertexLoader.cpp
View File

@ -183,7 +183,7 @@ VertexLoader::VertexLoader(const TVtxDesc &vtx_desc, const VAT &vtx_attr)
m_numLoadedVertices = 0;
m_VertexSize = 0;
m_numPipelineStages = 0;
m_NativeFmt = NativeVertexFormat::Create();
m_NativeFmt = g_vertex_manager->CreateNativeVertexFormat();
loop_counter = 0;
VertexLoader_Normal::Init();
VertexLoader_Position::Init();

4
Source/Core/VideoCommon/Src/VertexManagerBase.h
View File

@ -2,6 +2,8 @@
#ifndef _VERTEXMANAGERBASE_H
#define _VERTEXMANAGERBASE_H
class NativeVertexFormat;
class VertexManager
{
public:
@ -35,6 +37,8 @@ public:
static void Flush();
virtual ::NativeVertexFormat* CreateNativeVertexFormat() = 0;
protected:
// TODO: make private after Flush() is merged
static void ResetBuffer();