N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/citra-emu/citra

Browse source 
Conflicts:
	src/video_core/gpu_debugger.h
This commit is contained in:
inspuration 2014-06-11 15:46:55 -04:00
commit 0c0d35c698
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/video_core/gpu_debugger.h
View file

@ -20,7 +20,7 @@ public:
// A vector of commands represented by their raw byte sequence // A vector of commands represented by their raw byte sequence
struct PicaCommand : public std::vector<u32> struct PicaCommand : public std::vector<u32>
{ {
Pica::CommandHeader& GetHeader() const const Pica::CommandHeader& GetHeader() const
{ {
const u32& val = at(1); const u32& val = at(1);
return *(Pica::CommandHeader*)&val; return *(Pica::CommandHeader*)&val;
@ -64,7 +64,7 @@ public:
} }
protected: protected:
GraphicsDebugger* GetDebugger() const const GraphicsDebugger* GetDebugger() const
{ {
return observed; return observed;
} }
@ -108,7 +108,7 @@ public:
} }
auto obj = std::pair<u32,PicaCommandList>(address, cmdlist); auto obj = std::pair<u32,PicaCommandList>(address, cmdlist);
auto it = find(command_lists.begin(), command_lists.end(), obj); auto it = std::find(command_lists.begin(), command_lists.end(), obj);
bool is_new = (it == command_lists.end()); bool is_new = (it == command_lists.end());
if (is_new) if (is_new)
command_lists.push_back(obj); command_lists.push_back(obj);