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

243 lines
7.7 KiB
C++
Raw Normal View History

Include CommonTypes.h instead of Common.h.
2014-09-08 01:06:58 +00:00
#include "Common/CommonTypes.h"
Convert all includes to relative paths.
2014-02-17 10:18:15 +00:00
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/NativeVertexFormat.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PerfQueryBase.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VertexManagerBase.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/XFMemory.h"
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
VertexManager *g_vertex_manager;
consistently usage of buffer pointers
2013-02-21 11:36:29 +00:00
u8 *VertexManager::s_pCurBufferPointer;
VertexManager cleanup
2013-02-22 07:41:52 +00:00
u8 *VertexManager::s_pBaseBufferPointer;
consistently usage of buffer pointers
2013-02-21 11:36:29 +00:00
u8 *VertexManager::s_pEndBufferPointer;
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
PrimitiveType VertexManager::current_primitive_type;
VideoCommon: allow backends to set the buffer pointer as they want to
2014-01-23 12:11:38 +00:00
bool VertexManager::IsFlushed;
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
static const PrimitiveType primitive_from_gx[8] = {
PRIMITIVE_TRIANGLES, // GX_DRAW_QUADS
Opcode decoding: handle missing opcodes 0x88 etc. Hardware testing shows that they do the same thing as the 0x80 family of opcodes: they draw quads.
2014-05-08 23:53:18 +00:00
PRIMITIVE_TRIANGLES, // GX_DRAW_QUADS_2
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLES
PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLE_STRIP
PRIMITIVE_TRIANGLES, // GX_DRAW_TRIANGLE_FAN
PRIMITIVE_LINES, // GX_DRAW_LINES
PRIMITIVE_LINES, // GX_DRAW_LINE_STRIP
PRIMITIVE_POINTS, // GX_DRAW_POINTS
};
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
VertexManager::VertexManager()
{
VideoCommon: allow backends to set the buffer pointer as they want to
2014-01-23 12:11:38 +00:00
IsFlushed = true;
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
}
VertexManager::~VertexManager()
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
}
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
Tweak Vertex/Index buffer handling a bit.
2013-02-27 04:47:50 +00:00
u32 VertexManager::GetRemainingSize()
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
{
Tweak Vertex/Index buffer handling a bit.
2013-02-27 04:47:50 +00:00
return (u32)(s_pEndBufferPointer - s_pCurBufferPointer);
}
void VertexManager::PrepareForAdditionalData(int primitive, u32 count, u32 stride)
Run code through the advanced tool 'sed' to remove trailing whitespace.
2013-10-29 05:23:17 +00:00
{
Vertex Loader: SSE implementations of more position/texcoord/normal formats ~35-45% faster NFS:HP2, possibly other vertex-bound games.
2014-11-11 09:48:38 +00:00
// The SSE vertex loader can write up to 4 bytes past the end
u32 const needed_vertex_bytes = count * stride + 4;
Run code through the advanced tool 'sed' to remove trailing whitespace.
2013-10-29 05:23:17 +00:00
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
// We can't merge different kinds of primitives, so we have to flush here
if (current_primitive_type != primitive_from_gx[primitive])
Flush();
current_primitive_type = primitive_from_gx[primitive];
// Check for size in buffer, if the buffer gets full, call Flush()
VideoCommon: fix "Buffer not large enough for all vertices!"
2014-01-23 22:39:20 +00:00
if ( !IsFlushed && ( count > IndexGenerator::GetRemainingIndices() ||
count > GetRemainingIndices(primitive) || needed_vertex_bytes > GetRemainingSize() ) )
Tweak Vertex/Index buffer handling a bit.
2013-02-27 04:47:50 +00:00
{
Flush();
Run code through the advanced tool 'sed' to remove trailing whitespace.
2013-10-29 05:23:17 +00:00
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
if (count > IndexGenerator::GetRemainingIndices())
Fix some typos and correct some capitalizations in the log messages. Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 23:10:21 +00:00
ERROR_LOG(VIDEO, "Too little remaining index values. Use 32-bit or reset them on flush.");
fix VertexManager::GetRemainingIndices the old implementation returns the amound of primitives fit into index buffers but also gc needs more than one index per primitve
2013-03-06 11:33:02 +00:00
if (count > GetRemainingIndices(primitive))
ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all indices! "
Fix some typos and correct some capitalizations in the log messages. Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 23:10:21 +00:00
"Increase MAXIBUFFERSIZE or we need primitive breaking after all.");
check for overflow vertex indices, fixes issue 6135 thx @ JMC47 for identifying the reversion, creating a useful bug report with fifo log :-)
2013-03-22 23:18:35 +00:00
if (needed_vertex_bytes > GetRemainingSize())
ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all vertices! "
Fix some typos and correct some capitalizations in the log messages. Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 23:10:21 +00:00
"Increase MAXVBUFFERSIZE or we need primitive breaking after all.");
Tweak Vertex/Index buffer handling a bit.
2013-02-27 04:47:50 +00:00
}
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
VideoCommon: allow backends to set the buffer pointer as they want to
2014-01-23 12:11:38 +00:00
// need to alloc new buffer
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
if (IsFlushed)
VideoCommon: allow backends to set the buffer pointer as they want to
2014-01-23 12:11:38 +00:00
{
g_vertex_manager->ResetBuffer(stride);
IsFlushed = false;
}
VertexManager cleanup
2013-02-22 07:41:52 +00:00
}
Tweak Vertex/Index buffer handling a bit.
2013-02-27 04:47:50 +00:00
u32 VertexManager::GetRemainingIndices(int primitive)
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
{
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
u32 index_len = MAXIBUFFERSIZE - IndexGenerator::GetIndexLen();
Run code through the advanced tool 'sed' to remove trailing whitespace.
2013-10-29 05:23:17 +00:00
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
if (g_Config.backend_info.bSupportsPrimitiveRestart)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
switch (primitive)
{
case GX_DRAW_QUADS:
Opcode decoding: handle missing opcodes 0x88 etc. Hardware testing shows that they do the same thing as the 0x80 family of opcodes: they draw quads.
2014-05-08 23:53:18 +00:00
case GX_DRAW_QUADS_2:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 5 * 4;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_TRIANGLES:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 4 * 3;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_TRIANGLE_STRIP:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 1 - 1;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_TRIANGLE_FAN:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 6 * 4 + 1;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_LINES:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_LINE_STRIP:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 2 + 1;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_POINTS:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
default:
return 0;
}
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
}
else
{
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
switch (primitive)
{
case GX_DRAW_QUADS:
Opcode decoding: handle missing opcodes 0x88 etc. Hardware testing shows that they do the same thing as the 0x80 family of opcodes: they draw quads.
2014-05-08 23:53:18 +00:00
case GX_DRAW_QUADS_2:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 6 * 4;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_TRIANGLES:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_TRIANGLE_STRIP:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 3 + 2;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_TRIANGLE_FAN:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 3 + 2;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_LINES:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_LINE_STRIP:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len / 2 + 1;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
case GX_DRAW_POINTS:
VideoCommon: merge triangle+list+point index buffers We are used to render them out of order as long as everything else matches, but rendering order does matter, so we have to flush on primitive switch. This commit implements this flush. Also as we flush on primitive switch, we don't have to create three different index buffers. All indices are now stored in one buffer. This will slow down games which switch often primitive types (eg ztp), but it should be more accurate.
2014-01-15 20:44:46 +00:00
return index_len;
first try of primitive restart index generator Convert all quads+triangles into trangle_strip and uses primitive restart to split them. Speed up triangle_strip, but slows down all others primitive formats. Only implemented in ogl.
2013-03-29 13:27:33 +00:00
default:
return 0;
}
Run code through the advanced tool 'sed' to remove trailing whitespace.
2013-10-29 05:23:17 +00:00
}
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
}
void VertexManager::Flush()
{
Include CommonTypes.h instead of Common.h.
2014-09-08 01:06:58 +00:00
if (IsFlushed)
return;
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +00:00
add invalid flag for BPStructs (fix issue 5790) this flag will be set on loading a state and checked before every rendering.
2012-12-21 20:04:53 +00:00
// loading a state will invalidate BP, so check for it
revert last commit, add CheckInvalidState to VideoBackend
2012-12-23 12:32:23 +00:00
g_video_backend->CheckInvalidState();
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +00:00
VertexManager cleanup
2013-02-22 07:41:52 +00:00
VideoFifo_CheckEFBAccess();
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +00:00
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
#if defined(_DEBUG) || defined(DEBUGFAST)
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
PRIM_LOG("frame%d:\n texgen=%d, numchan=%d, dualtex=%d, ztex=%d, cole=%d, alpe=%d, ze=%d", g_ActiveConfig.iSaveTargetId, xfmem.numTexGen.numTexGens,
xfmem.numChan.numColorChans, xfmem.dualTexTrans.enabled, bpmem.ztex2.op,
Fix a few warnings caused by using BitField with non-typesafe functions.
2014-06-11 18:34:15 +00:00
(int)bpmem.blendmode.colorupdate, (int)bpmem.blendmode.alphaupdate, (int)bpmem.zmode.updateenable);
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
for (unsigned int i = 0; i < xfmem.numChan.numColorChans; ++i)
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
{
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
LitChannel* ch = &xfmem.color[i];
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
PRIM_LOG("colchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
ch = &xfmem.alpha[i];
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
PRIM_LOG("alpchan%d: matsrc=%d, light=0x%x, ambsrc=%d, diffunc=%d, attfunc=%d", i, ch->matsource, ch->GetFullLightMask(), ch->ambsource, ch->diffusefunc, ch->attnfunc);
}
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
{
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
TexMtxInfo tinfo = xfmem.texMtxInfo[i];
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
if (tinfo.texgentype != XF_TEXGEN_EMBOSS_MAP) tinfo.hex &= 0x7ff;
if (tinfo.texgentype != XF_TEXGEN_REGULAR) tinfo.projection = 0;
PRIM_LOG("txgen%d: proj=%d, input=%d, gentype=%d, srcrow=%d, embsrc=%d, emblght=%d, postmtx=%d, postnorm=%d",
i, tinfo.projection, tinfo.inputform, tinfo.texgentype, tinfo.sourcerow, tinfo.embosssourceshift, tinfo.embosslightshift,
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
xfmem.postMtxInfo[i].index, xfmem.postMtxInfo[i].normalize);
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
}
Fix a few warnings caused by using BitField with non-typesafe functions.
2014-06-11 18:34:15 +00:00
PRIM_LOG("pixel: tev=%d, ind=%d, texgen=%d, dstalpha=%d, alphatest=0x%x", (int)bpmem.genMode.numtevstages+1, (int)bpmem.genMode.numindstages,
(int)bpmem.genMode.numtexgens, (u32)bpmem.dstalpha.enable, (bpmem.alpha_test.hex>>16)&0xff);
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
#endif
Convert some VideoCommon stuff to BitSet. Now with a minor performance improvement removed for no reason.
2014-10-22 00:42:55 +00:00
BitSet32 usedtextures;
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
for (u32 i = 0; i < bpmem.genMode.numtevstages + 1u; ++i)
if (bpmem.tevorders[i / 2].getEnable(i & 1))
Convert some VideoCommon stuff to BitSet. Now with a minor performance improvement removed for no reason.
2014-10-22 00:42:55 +00:00
usedtextures[bpmem.tevorders[i/2].getTexMap(i & 1)] = true;
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
if (bpmem.genMode.numindstages > 0)
for (unsigned int i = 0; i < bpmem.genMode.numtevstages + 1u; ++i)
if (bpmem.tevind[i].IsActive() && bpmem.tevind[i].bt < bpmem.genMode.numindstages)
Convert some VideoCommon stuff to BitSet. Now with a minor performance improvement removed for no reason.
2014-10-22 00:42:55 +00:00
usedtextures[bpmem.tevindref.getTexMap(bpmem.tevind[i].bt)] = true;
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
Convert some VideoCommon stuff to BitSet. Now with a minor performance improvement removed for no reason.
2014-10-22 00:42:55 +00:00
for (unsigned int i : usedtextures)
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
{
Convert some VideoCommon stuff to BitSet. Now with a minor performance improvement removed for no reason.
2014-10-22 00:42:55 +00:00
g_renderer->SetSamplerState(i & 3, i >> 2);
const FourTexUnits &tex = bpmem.tex[i >> 2];
const TextureCache::TCacheEntryBase* tentry = TextureCache::Load(i,
(tex.texImage3[i&3].image_base/* & 0x1FFFFF*/) << 5,
tex.texImage0[i&3].width + 1, tex.texImage0[i&3].height + 1,
tex.texImage0[i&3].format, tex.texTlut[i&3].tmem_offset<<9,
tex.texTlut[i&3].tlut_format,
((tex.texMode0[i&3].min_filter & 3) != 0),
(tex.texMode1[i&3].max_lod + 0xf) / 0x10,
(tex.texImage1[i&3].image_type != 0));
if (tentry)
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
{
Convert some VideoCommon stuff to BitSet. Now with a minor performance improvement removed for no reason.
2014-10-22 00:42:55 +00:00
// 0s are probably for no manual wrapping needed.
PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
}
Convert some VideoCommon stuff to BitSet. Now with a minor performance improvement removed for no reason.
2014-10-22 00:42:55 +00:00
else
ERROR_LOG(VIDEO, "error loading texture");
VideoCommon: merge trivial parts of VertexManager::Flush
2014-01-21 09:47:00 +00:00
}
// set global constants
VertexShaderManager::SetConstants();
PixelShaderManager::SetConstants();
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
bool useDstAlpha = !g_ActiveConfig.bDstAlphaPass &&
bpmem.dstalpha.enable &&
bpmem.blendmode.alphaupdate &&
BPMemory: Expose the pixel_format and zformat fields in PE_CONTROL as enumerations.
2014-03-23 20:44:23 +00:00
bpmem.zcontrol.pixel_format == PEControl::RGBA6_Z24;
move shared parts from VertexManager::vFlush into VideoCommon
2014-02-03 15:56:17 +00:00
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
if (PerfQueryBase::ShouldEmulate())
move perfquery enable checks into videocommon (caller side)
2014-02-04 19:16:03 +00:00
g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
move shared parts from VertexManager::vFlush into VideoCommon
2014-02-03 15:56:17 +00:00
g_vertex_manager->vFlush(useDstAlpha);
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
if (PerfQueryBase::ShouldEmulate())
move perfquery enable checks into videocommon (caller side)
2014-02-04 19:16:03 +00:00
g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
move shared parts from VertexManager::vFlush into VideoCommon
2014-02-03 15:56:17 +00:00
GFX_DEBUGGER_PAUSE_AT(NEXT_FLUSH, true);
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +00:00
Added a xf.numtexgen != bp.numtextgen error log if there is a mismatch detected.
2014-09-24 00:46:09 +00:00
if (xfmem.numTexGen.numTexGens != bpmem.genMode.numtexgens)
ERROR_LOG(VIDEO, "xf.numtexgens (%d) does not match bp.numtexgens (%d). Error in command stream.", xfmem.numTexGen.numTexGens, bpmem.genMode.numtexgens.Value());
VideoCommon: allow backends to set the buffer pointer as they want to
2014-01-23 12:11:38 +00:00
IsFlushed = true;
Add Turntable.cpp to SCons build. Set native eol-style on recently added files. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6252 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-03 08:20:24 +00:00
}
Merged common texture cache code from video plugins into VideoCommon. (DX11 native mipmaps currently broken, disabled) Hopefully everything else should still be working. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6288 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-19 22:24:27 +00:00
savestate vertexmanager (base) since it affects VertexLoader::RunVertices which affects g_pVideoData
2012-01-04 08:42:22 +00:00
void VertexManager::DoState(PointerWrap& p)
{
g_vertex_manager->vDoState(p);
}