mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 20:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make Cg conditional on those platforms for which it is available.

Browse source 
Of course, this doesn't do much good without another shader compiler..

WIP of OS X application bundle building.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5961 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-07-24 10:24:16 +00:00
commit 53f5bc682d
9 changed files with 59 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
View file

@ -20,9 +20,6 @@
#include "GLUtil.h"
#include <Cg/cg.h>
#include <Cg/cgGL.h>
#include <cmath>
#include "Statistics.h"
@ -248,6 +245,7 @@ bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpr
ERROR_LOG(VIDEO, "glError %08x before PS!", err);
}
#if defined HAVE_CG && HAVE_CG
char stropt[128];
sprintf(stropt, "MaxLocalParams=32,NumInstructionSlots=%d", s_nMaxPixelInstructions);
const char *opts[] = {"-profileopts", stropt, "-O2", "-q", NULL};
@ -305,6 +303,7 @@ bool PixelShaderCache::CompilePixelShader(FRAGMENTSHADER& ps, const char* pstrpr
}
cgDestroyProgram(tempprog);
#endif
#if defined(_DEBUG) || defined(DEBUGFAST)
ps.strprog = pstrprogram;