ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation 

i missed to fix a merge conflict in dx9
This commit is contained in:
degasus 2013-03-06 16:17:07 +01:00
parent a1c5e90083
commit 03511d54d6
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
View File

@ -173,7 +173,7 @@ void VertexManager::PrepareDrawBuffers(u32 stride)
DestroyDeviceObjects(); DestroyDeviceObjects();
return; return;
} }
memcpy(pVertices, s_pBaseBufferPointer,, datasize); memcpy(pVertices, s_pBaseBufferPointer, datasize);
m_vertex_buffers[m_current_vertex_buffer]->Unlock(); m_vertex_buffers[m_current_vertex_buffer]->Unlock();
LockMode = D3DLOCK_NOOVERWRITE; LockMode = D3DLOCK_NOOVERWRITE;
@ -257,7 +257,7 @@ void VertexManager::DrawVertexBuffer(int stride)
{ {
if (FAILED(D3D::dev->DrawPrimitive( if (FAILED(D3D::dev->DrawPrimitive(
D3DPT_POINTLIST, D3DPT_POINTLIST,
basevertex + PIBuffer[i], basevertex + GetPointIndexBuffer()[i],
1))) 1)))
{ {
DumpBadShaders(); DumpBadShaders();
@ -280,13 +280,8 @@ void VertexManager::DrawVertexArray(int stride)
{ {
if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( if (FAILED(D3D::dev->DrawIndexedPrimitiveUP(
D3DPT_TRIANGLELIST, D3DPT_TRIANGLELIST,
<<<<<<< HEAD
0, numverts, triangles, 0, numverts, triangles,
TIBuffer,
=======
0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumTriangles(),
GetTriangleIndexBuffer(), GetTriangleIndexBuffer(),
>>>>>>> master
D3DFMT_INDEX16, D3DFMT_INDEX16,
s_pBaseBufferPointer, s_pBaseBufferPointer,
stride))) stride)))
@ -299,13 +294,8 @@ void VertexManager::DrawVertexArray(int stride)
{ {
if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( if (FAILED(D3D::dev->DrawIndexedPrimitiveUP(
D3DPT_LINELIST, D3DPT_LINELIST,
<<<<<<< HEAD
0, numverts, lines, 0, numverts, lines,
LIBuffer,
=======
0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumLines(),
GetLineIndexBuffer(), GetLineIndexBuffer(),
>>>>>>> master
D3DFMT_INDEX16, D3DFMT_INDEX16,
s_pBaseBufferPointer, s_pBaseBufferPointer,
stride))) stride)))
@ -318,13 +308,8 @@ void VertexManager::DrawVertexArray(int stride)
{ {
if (FAILED(D3D::dev->DrawIndexedPrimitiveUP( if (FAILED(D3D::dev->DrawIndexedPrimitiveUP(
D3DPT_POINTLIST, D3DPT_POINTLIST,
<<<<<<< HEAD
0, numverts, points, 0, numverts, points,
PIBuffer,
=======
0, IndexGenerator::GetNumVerts(), IndexGenerator::GetNumPoints(),
GetPointIndexBuffer(), GetPointIndexBuffer(),
>>>>>>> master
D3DFMT_INDEX16, D3DFMT_INDEX16,
s_pBaseBufferPointer, s_pBaseBufferPointer,
stride))) stride)))
@ -337,10 +322,6 @@ void VertexManager::DrawVertexArray(int stride)
void VertexManager::vFlush() void VertexManager::vFlush()
{ {
<<<<<<< HEAD
VideoFifo_CheckEFBAccess();
=======
>>>>>>> master
u32 usedtextures = 0; u32 usedtextures = 0;
for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i) for (u32 i = 0; i < (u32)bpmem.genMode.numtevstages + 1; ++i)
if (bpmem.tevorders[i / 2].getEnable(i & 1)) if (bpmem.tevorders[i / 2].getEnable(i & 1))