Code movin' and cleanup again, in the GL plugin. Planning to turn NativeVertexFormat into something cachable, instead of locked to each VertexLoader.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@948 8ced0084-cf51-0410-be5f-012b33b47a6e

5 files changed, 96 insertions, 35 deletions

diff --git a/Source/Core/VideoCommon/Src/NativeVertexFormat.h b/Source/Core/VideoCommon/Src/NativeVertexFormat.h
new file mode 100644
index 0000000000..817b5ded1f
--- /dev/null
+++ b/Source/Core/VideoCommon/Src/NativeVertexFormat.h
@@ -0,0 +1,88 @@
+// Copyright (C) 2003-2008 Dolphin Project.

+

+// This program is free software: you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation, version 2.0.

+

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License 2.0 for more details.

+

+// A copy of the GPL 2.0 should have been included with the program.

+// If not, see http://www.gnu.org/licenses/

+

+// Official SVN repository and contact information can be found at

+// http://code.google.com/p/dolphin-emu/

+

+#ifndef _NATIVEVERTEXFORMAT_H

+#define _NATIVEVERTEXFORMAT_H

+

+#include "CPMemory.h"

+

+// m_components

+enum {

+	VB_HAS_POSMTXIDX =(1<<1),

+	VB_HAS_TEXMTXIDX0=(1<<2),

+	VB_HAS_TEXMTXIDX1=(1<<3),

+	VB_HAS_TEXMTXIDX2=(1<<4),

+	VB_HAS_TEXMTXIDX3=(1<<5),

+	VB_HAS_TEXMTXIDX4=(1<<6),

+	VB_HAS_TEXMTXIDX5=(1<<7),

+	VB_HAS_TEXMTXIDX6=(1<<8),

+	VB_HAS_TEXMTXIDX7=(1<<9),

+	VB_HAS_TEXMTXIDXALL=(0xff<<2),

+

+	//VB_HAS_POS=0, // Implied, it always has pos! don't bother testing

+	VB_HAS_NRM0=(1<<10),

+	VB_HAS_NRM1=(1<<11),

+	VB_HAS_NRM2=(1<<12),

+	VB_HAS_NRMALL=(7<<10),

+

+	VB_HAS_COL0=(1<<13),

+	VB_HAS_COL1=(1<<14),

+

+	VB_HAS_UV0=(1<<15),

+	VB_HAS_UV1=(1<<16),

+	VB_HAS_UV2=(1<<17),

+	VB_HAS_UV3=(1<<18),

+	VB_HAS_UV4=(1<<19),

+	VB_HAS_UV5=(1<<20),

+	VB_HAS_UV6=(1<<21),

+	VB_HAS_UV7=(1<<22),

+	VB_HAS_UVALL=(0xff<<15),

+	VB_HAS_UVTEXMTXSHIFT=13,

+};

+

+

+#define LOADERDECL __cdecl

+typedef void (LOADERDECL *TPipelineFunction)(const void *);

+

+// This will soon be used in a cache of vertex formats, rather than used in-place.

+// The implementation of this class is specific for GL/DX, so NativeVertexFormat.cpp

+// is in the respective plugin, not here in VideoCommon.

+

+// Note that this class can't just invent arbitrary vertex formats out of its input - 

+// all the data loading code must always be made compatible.

+class NativeVertexFormat

+{

+	void SetupColor(int num, int _iMode, int _iFormat, int _iElements);

+	void SetupTexCoord(int num, int _iMode, int _iFormat, int _iElements, int _iFrac);

+

+public:

+	NativeVertexFormat();

+	~NativeVertexFormat();

+

+	void Initialize(const TVtxDesc &vtx_desc, const TVtxAttr &vtx_attr);

+	void RunPipelineOnce(const TVtxAttr &vtx_attr) const;

+

+	// TODO: move these in under private:

+	int m_VBVertexStride;  // PC-side vertex stride

+	int m_VBStridePad;

+	u32 m_components;  // VB_HAS_X. Bitmask telling what vertex components are present.

+	TPipelineFunction m_PipelineStages[32];

+	int m_numPipelineStages;

+	u8* m_compiledCode;

+};

+

+#endif  // _NATIVEVERTEXFORMAT_H

diff --git a/Source/Core/VideoCommon/Src/Profiler.h b/Source/Core/VideoCommon/Src/Profiler.h
index 62808c3e07..db7524bca6 100644
--- a/Source/Core/VideoCommon/Src/Profiler.h
+++ b/Source/Core/VideoCommon/Src/Profiler.h
@@ -61,7 +61,7 @@ public:
 

 #else

 

-#define DVSTARTPROFILE(name)

+#define DVSTARTPROFILE()

 #define DVSTARTSUBPROFILE(name)

 

 class DVProfileFunc

diff --git a/Source/Core/VideoCommon/Src/VertexShader.cpp b/Source/Core/VideoCommon/Src/VertexShader.cpp
index 556aefb153..97b7f9b426 100644
--- a/Source/Core/VideoCommon/Src/VertexShader.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShader.cpp
@@ -15,9 +15,11 @@
 // Official SVN repository and contact information can be found at

 // http://code.google.com/p/dolphin-emu/

 

-#include "Profiler.h"

 #include <math.h>

 

+#include "Profiler.h"

+#include "NativeVertexFormat.h"

+

 #include "BPMemory.h"

 #include "VertexShader.h"

 

diff --git a/Source/Core/VideoCommon/Src/VertexShader.h b/Source/Core/VideoCommon/Src/VertexShader.h
index 4845241d56..1c89374132 100644
--- a/Source/Core/VideoCommon/Src/VertexShader.h
+++ b/Source/Core/VideoCommon/Src/VertexShader.h
@@ -24,39 +24,6 @@
 #define SHADER_NORM1_ATTRIB 6

 #define SHADER_NORM2_ATTRIB 7

 

-// m_components

-enum {

-    VB_HAS_POSMTXIDX =(1<<1),

-    VB_HAS_TEXMTXIDX0=(1<<2),

-    VB_HAS_TEXMTXIDX1=(1<<3),

-    VB_HAS_TEXMTXIDX2=(1<<4),

-    VB_HAS_TEXMTXIDX3=(1<<5),

-    VB_HAS_TEXMTXIDX4=(1<<6),

-    VB_HAS_TEXMTXIDX5=(1<<7),

-    VB_HAS_TEXMTXIDX6=(1<<8),

-    VB_HAS_TEXMTXIDX7=(1<<9),

-    VB_HAS_TEXMTXIDXALL=(0xff<<2),

-

-	//VB_HAS_POS=0, // Implied, it always has pos! don't bother testing

-    VB_HAS_NRM0=(1<<10),

-    VB_HAS_NRM1=(1<<11),

-    VB_HAS_NRM2=(1<<12),

-    VB_HAS_NRMALL=(7<<10),

-    

-    VB_HAS_COL0=(1<<13),

-    VB_HAS_COL1=(1<<14),

-

-    VB_HAS_UV0=(1<<15),

-    VB_HAS_UV1=(1<<16),

-    VB_HAS_UV2=(1<<17),

-    VB_HAS_UV3=(1<<18),

-    VB_HAS_UV4=(1<<19),

-    VB_HAS_UV5=(1<<20),

-    VB_HAS_UV6=(1<<21),

-    VB_HAS_UV7=(1<<22),

-    VB_HAS_UVALL=(0xff<<15),

-    VB_HAS_UVTEXMTXSHIFT=13,

-};

 

 // shader variables

 #define I_POSNORMALMATRIX "cpnmtx"

diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index e2795fde9b..35e29e4e42 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -480,6 +480,10 @@
 			>

 		</File>

 		<File

+			RelativePath=".\Src\NativeVertexFormat.h"

+			>

+		</File>

+		<File

 			RelativePath=".\Src\OpcodeDecoding.h"

 			>

 		</File>