diff options
| author | luisr142004 <luisr142004@gmail.com> | 2010-06-16 10:12:57 +0000 |
|---|---|---|
| committer | luisr142004 <luisr142004@gmail.com> | 2010-06-16 10:12:57 +0000 |
| commit | 4f8a6a1573ef82c5000d8e44ce7d563c4a03ba17 (patch) | |
| tree | 17bc1ff411578b15b12d388fb9338802f891d119 /Source/Core | |
| parent | 980a2680be7a809f369d4ce978c0d1ce3bb377cb (diff) | |
apply some speedup to dx11 plugin + some minor stuff
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5721 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/IndexGenerator.cpp | 32 |
2 files changed, 14 insertions, 20 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 497e7bd875..56d129c964 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -366,7 +366,7 @@ void CConfigMain::InitializeGUITooltips() void CConfigMain::CreateGUIControls() { InitializeGUILists(); - + // Create the notebook and pages Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize); GeneralPage = new wxPanel(Notebook, ID_GENERALPAGE, wxDefaultPosition, wxDefaultSize); diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.cpp b/Source/Core/VideoCommon/Src/IndexGenerator.cpp index f6b2c28267..1517e48008 100644 --- a/Source/Core/VideoCommon/Src/IndexGenerator.cpp +++ b/Source/Core/VideoCommon/Src/IndexGenerator.cpp @@ -18,12 +18,12 @@ #include "IndexGenerator.h" /* -* +* QUAD simulator -0 2 4 6 +0 2 4 6 1 3 5 7 -021231 243453 +021231 243453 */ //Init @@ -36,7 +36,7 @@ u16 *IndexGenerator::BASEPptr = 0; int IndexGenerator::numT = 0; int IndexGenerator::numL = 0; int IndexGenerator::numP = 0; -int IndexGenerator::index = 0; +int IndexGenerator::index = 0; int IndexGenerator::Tadds = 0; int IndexGenerator::Ladds = 0; int IndexGenerator::Padds = 0; @@ -45,7 +45,7 @@ IndexGenerator::IndexPrimitiveType IndexGenerator::LastLPrimitive = Prim_None; bool IndexGenerator::used = false; void IndexGenerator::Start(u16 *Triangleptr,u16 *Lineptr,u16 *Pointptr) -{ +{ Tptr = Triangleptr; Lptr = Lineptr; Pptr = Pointptr; @@ -67,7 +67,7 @@ void IndexGenerator::AddList(int numVerts) { //if we have no vertices return if(numVerts <= 0) return; - int numTris = numVerts / 3; + int numTris = numVerts / 3; if (!numTris) { //if we have less than 3 verts @@ -84,7 +84,7 @@ void IndexGenerator::AddList(int numVerts) *Tptr++ = index; *Tptr++ = index+1; *Tptr++ = index; - } + } } else { @@ -130,7 +130,7 @@ void IndexGenerator::AddStrip(int numVerts) //if we have less than 3 verts if(numVerts == 1) { - //dicard + // discard index++; return; } @@ -156,7 +156,7 @@ void IndexGenerator::AddStrip(int numVerts) } index += numVerts; numT += numTris; - Tadds++; + Tadds++; LastTPrimitive = Prim_Strip; } void IndexGenerator::AddFan(int numVerts) @@ -192,7 +192,7 @@ void IndexGenerator::AddFan(int numVerts) } index += numVerts; numT += numTris; - Tadds++; + Tadds++; LastTPrimitive = Prim_Fan; } @@ -270,7 +270,7 @@ void IndexGenerator::AddQuads(int numVerts) } index += numVerts; numT += numTris; - Tadds++; + Tadds++; LastTPrimitive = Prim_List; } @@ -324,7 +324,7 @@ void IndexGenerator::AddLineStrip(int numVerts) } index += numVerts; numL += numLines; - Ladds++; + Ladds++; LastLPrimitive = Prim_Strip; } @@ -335,15 +335,9 @@ void IndexGenerator::AddPoints(int numVerts) { for (int i = 0; i < numVerts; i++) { - *Pptr++ = index+i; + *Pptr++ = index+i; } index += numVerts; numP += numVerts; Padds++; } - - - - - - |