mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 05:40:01 -06:00
Move parts of VertexManager.h to VideoCommon. Opens for moving the VertexLoader to VideoCommon.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1689 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
26
Source/Core/VideoCommon/Src/NativeVertexWriter.cpp
Normal file
26
Source/Core/VideoCommon/Src/NativeVertexWriter.cpp
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// 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/
|
||||||
|
|
||||||
|
#include "Common.h"
|
||||||
|
#include "NativeVertexWriter.h"
|
||||||
|
|
||||||
|
namespace VertexManager
|
||||||
|
{
|
||||||
|
|
||||||
|
u8* s_pCurBufferPointer = NULL;
|
||||||
|
|
||||||
|
}
|
37
Source/Core/VideoCommon/Src/NativeVertexWriter.h
Normal file
37
Source/Core/VideoCommon/Src/NativeVertexWriter.h
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
// 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 _NATIVE_VERTEX_WRITER
|
||||||
|
#define _NATIVE_VERTEX_WRITER
|
||||||
|
|
||||||
|
// TODO: rename
|
||||||
|
namespace VertexManager
|
||||||
|
{
|
||||||
|
|
||||||
|
void AddVertices(int primitive, int numvertices);
|
||||||
|
void Flush(); // flushes the current buffer
|
||||||
|
|
||||||
|
// These two don't really belong here and are not relevant for D3D - TODO, find better place to put them.
|
||||||
|
int GetRemainingSize(); // remaining space in the current buffer.
|
||||||
|
void EnableComponents(u32 components); // very implementation specific - D3D9 won't need this one.
|
||||||
|
|
||||||
|
// TODO: move, rename.
|
||||||
|
extern u8* s_pCurBufferPointer;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
@ -15,6 +15,7 @@ files = [
|
|||||||
"VertexShader.cpp",
|
"VertexShader.cpp",
|
||||||
"VertexShaderManager.cpp",
|
"VertexShaderManager.cpp",
|
||||||
"ImageWrite.cpp",
|
"ImageWrite.cpp",
|
||||||
|
"NativeVertexWriter.cpp",
|
||||||
"Statistics.cpp",
|
"Statistics.cpp",
|
||||||
"Fifo.cpp",
|
"Fifo.cpp",
|
||||||
"VideoState.cpp",
|
"VideoState.cpp",
|
||||||
|
@ -499,6 +499,14 @@
|
|||||||
RelativePath=".\Src\NativeVertexFormat.h"
|
RelativePath=".\Src\NativeVertexFormat.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\Src\NativeVertexWriter.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\Src\NativeVertexWriter.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\Src\OpcodeDecoding.cpp"
|
RelativePath=".\Src\OpcodeDecoding.cpp"
|
||||||
>
|
>
|
||||||
|
@ -29,11 +29,11 @@
|
|||||||
|
|
||||||
#include "LookUpTables.h"
|
#include "LookUpTables.h"
|
||||||
#include "Statistics.h"
|
#include "Statistics.h"
|
||||||
#include "VertexManager.h"
|
|
||||||
#include "VertexLoaderManager.h"
|
#include "VertexLoaderManager.h"
|
||||||
#include "VertexLoader.h"
|
#include "VertexLoader.h"
|
||||||
#include "BPMemory.h"
|
#include "BPMemory.h"
|
||||||
#include "DataReader.h"
|
#include "DataReader.h"
|
||||||
|
#include "NativeVertexWriter.h"
|
||||||
|
|
||||||
#include "VertexLoader_Position.h"
|
#include "VertexLoader_Position.h"
|
||||||
#include "VertexLoader_Normal.h"
|
#include "VertexLoader_Normal.h"
|
||||||
|
@ -33,9 +33,6 @@ static u8 *s_pBaseBufferPointer = NULL;
|
|||||||
static std::vector< std::pair<u32, u32> > s_vStoredPrimitives; // every element, mode and count to be passed to glDrawArrays
|
static std::vector< std::pair<u32, u32> > s_vStoredPrimitives; // every element, mode and count to be passed to glDrawArrays
|
||||||
static u32 s_prevcomponents; // previous state set
|
static u32 s_prevcomponents; // previous state set
|
||||||
|
|
||||||
u8* s_pCurBufferPointer = NULL;
|
|
||||||
|
|
||||||
|
|
||||||
static const GLenum c_primitiveType[8] =
|
static const GLenum c_primitiveType[8] =
|
||||||
{
|
{
|
||||||
GL_QUADS,
|
GL_QUADS,
|
||||||
|
@ -15,11 +15,11 @@
|
|||||||
// Official SVN repository and contact information can be found at
|
// Official SVN repository and contact information can be found at
|
||||||
// http://code.google.com/p/dolphin-emu/
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
|
|
||||||
#ifndef _VERTEXMANAGER_H
|
#ifndef _VERTEXMANAGER_H
|
||||||
#define _VERTEXMANAGER_H
|
#define _VERTEXMANAGER_H
|
||||||
|
|
||||||
#include "CPMemory.h"
|
#include "CPMemory.h"
|
||||||
|
#include "NativeVertexWriter.h"
|
||||||
|
|
||||||
// Handles the OpenGL details of drawing lots of vertices quickly.
|
// Handles the OpenGL details of drawing lots of vertices quickly.
|
||||||
// Other functionality is moving out.
|
// Other functionality is moving out.
|
||||||
@ -31,16 +31,6 @@ void Shutdown();
|
|||||||
|
|
||||||
void ResetBuffer();
|
void ResetBuffer();
|
||||||
|
|
||||||
void AddVertices(int primitive, int numvertices);
|
|
||||||
void Flush(); // flushes the current buffer
|
|
||||||
|
|
||||||
int GetRemainingSize(); // remaining space in the current buffer.
|
|
||||||
|
|
||||||
void EnableComponents(u32 components); // very implementation specific - D3D9 won't need this one.
|
|
||||||
|
|
||||||
// TODO: move, rename.
|
|
||||||
extern u8* s_pCurBufferPointer;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _VERTEXMANAGER_H
|
#endif // _VERTEXMANAGER_H
|
||||||
|
Reference in New Issue
Block a user