Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into GLSL-master

Browse Source 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
This commit is contained in:
Ryan Houdek committed 2013-03-15 11:19:52 -05:00
2 parents 84119a966b d63d7fde9e
commit 8c1091a21f
38 files changed
+384 -190
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
+3 -3
View File
@@ -39,9 +39,9 @@ namespace DX11
{
// TODO: Find sensible values for these two
const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * 16 * sizeof(u16);
const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE * 16;
const UINT MAX_VBUFFER_COUNT = 2;
const UINT IBUFFER_SIZE = VertexManager::MAXIBUFFERSIZE * sizeof(u16) * 8;
const UINT VBUFFER_SIZE = VertexManager::MAXVBUFFERSIZE;
const UINT MAXVBUFFER_COUNT = 2;
void VertexManager::CreateDeviceObjects()
{