mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 12:19:12 +00:00
Massive style & comment cleanup of (mostly) GL plugin - also split some large files. A minor speedup for BP writes - merged the two switch()-es.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@899 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
4477f77cf6
commit
dcbc8e78d4
45 changed files with 1288 additions and 1554 deletions
|
@ -18,12 +18,16 @@
|
|||
#include "Globals.h"
|
||||
#include <list>
|
||||
|
||||
#include <Cg/cg.h>
|
||||
#include <Cg/cgGL.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <mmsystem.h>
|
||||
#endif
|
||||
|
||||
#include "GLInit.h"
|
||||
#include "Profiler.h"
|
||||
#include "ImageWrite.h"
|
||||
#include "Render.h"
|
||||
#include "OpcodeDecoding.h"
|
||||
#include "BPStructs.h"
|
||||
|
@ -67,6 +71,8 @@ static Renderer::RenderMode s_RenderMode = Renderer::RM_Normal;
|
|||
static int s_nCurTarget = 0;
|
||||
bool g_bBlendLogicOp = false;
|
||||
|
||||
float MValueX, MValueY; // Since it can Stretch to fit Window, we need two different multiplication values
|
||||
int frameCount;
|
||||
|
||||
void HandleCgError(CGcontext ctx, CGerror err, void* appdata);
|
||||
|
||||
|
@ -371,13 +377,12 @@ void Renderer::ProcessMessages()
|
|||
{
|
||||
GLboolean wasEnabled = glIsEnabled(GL_BLEND);
|
||||
|
||||
if(!wasEnabled) glEnable(GL_BLEND);
|
||||
if (!wasEnabled) glEnable(GL_BLEND);
|
||||
|
||||
if (s_listMsgs.size() > 0) {
|
||||
int left = 25, top = 15;
|
||||
list<MESSAGE>::iterator it = s_listMsgs.begin();
|
||||
|
||||
while( it != s_listMsgs.end() )
|
||||
while (it != s_listMsgs.end())
|
||||
{
|
||||
int time_left = (int)(it->dwTimeStamp - timeGetTime());
|
||||
int alpha = 255;
|
||||
|
@ -388,7 +393,7 @@ void Renderer::ProcessMessages()
|
|||
if(time_left<0) alpha=0;
|
||||
}
|
||||
|
||||
alpha<<=24;
|
||||
alpha <<= 24;
|
||||
|
||||
RenderText(it->str, left+1, top+1, 0x000000|alpha);
|
||||
RenderText(it->str, left, top, 0xffff30|alpha);
|
||||
|
@ -761,7 +766,6 @@ void Renderer::SwapBuffers()
|
|||
//p+=sprintf(p,"Num strip joins: %i\n",stats.numJoins);
|
||||
p+=sprintf(p,"Num primitives: %i\n",stats.thisFrame.numPrims);
|
||||
p+=sprintf(p,"Num primitives (DL): %i\n",stats.thisFrame.numDLPrims);
|
||||
p+=sprintf(p,"Num bad commands: %i%s\n",stats.thisFrame.numBadCommands,stats.thisFrame.numBadCommands?"!!!":"");
|
||||
p+=sprintf(p,"Num XF loads: %i\n",stats.thisFrame.numXFLoads);
|
||||
p+=sprintf(p,"Num XF loads (DL): %i\n",stats.thisFrame.numXFLoadsInDL);
|
||||
p+=sprintf(p,"Num CP loads: %i\n",stats.thisFrame.numCPLoads);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue