piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into windows-unicode

Browse Source
This commit is contained in:
Jordan Woyak
2013-03-03 14:40:10 -06:00
parent fad2b65d76 cedfa452b4
commit b1a2915304
6 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -69,7 +69,7 @@ bool OpenGL_ReportFBOError(const char *function, const char *file, int line);
#define GL_REPORT_PROGRAM_ERROR() (void)0
#endif
#if defined __APPLE__ || defined __linux__ || defined _WIN32
#if (defined __APPLE__ || defined __linux__ || defined _WIN32) && !(defined _M_ARM)
#include <Cg/cg.h>
#include <Cg/cgGL.h>
#define HAVE_CG 1

4
Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
View File

@ -9,7 +9,7 @@ PerfQuery::PerfQuery()
: m_query_read_pos()
, m_query_count()
{
for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
for (u32 i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
glGenQueries(1, &m_query_buffer[i].query_id);
ResetQuery();
@ -17,7 +17,7 @@ PerfQuery::PerfQuery()
PerfQuery::~PerfQuery()
{
for (int i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
for (u32 i = 0; i != ARRAYSIZE(m_query_buffer); ++i)
glDeleteQueries(1, &m_query_buffer[i].query_id);
}

6
Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.h
View File

@ -26,7 +26,7 @@ private:
};
// when testing in SMS: 64 was too small, 128 was ok
static const int PERF_QUERY_BUFFER_SIZE = 512;
static const u32 PERF_QUERY_BUFFER_SIZE = 512;
void WeakFlush();
// Only use when non-empty
@ -34,10 +34,10 @@ private:
// This contains gl query objects with unretrieved results.
ActiveQuery m_query_buffer[PERF_QUERY_BUFFER_SIZE];
int m_query_read_pos;
u32 m_query_read_pos;
// TODO: sloppy
volatile int m_query_count;
volatile u32 m_query_count;
volatile u32 m_results[PQG_NUM_MEMBERS];
};