Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Android buildfix

Browse source
This commit is contained in:
Henrik Rydgard 2013-08-06 11:24:48 +02:00
parent 2f0cdc6988
commit 2f1e6f81bb
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/MIPS/ARM/ArmCompVFPU.cpp
View file

@ -1146,8 +1146,6 @@ namespace MIPSComp
} }
void Jit::Comp_VCrossQuat(u32 op) { void Jit::Comp_VCrossQuat(u32 op) {
DISABLE;
// This op does not support prefixes. // This op does not support prefixes.
if (js.HasUnknownPrefix() || disablePrefixes) if (js.HasUnknownPrefix() || disablePrefixes)
DISABLE; DISABLE;

4
GPU/GLES/StateMapping.cpp
View file

@ -92,6 +92,7 @@ static const GLushort stencilOps[] = {
GL_KEEP, // reserved GL_KEEP, // reserved
}; };
#if !defined(USING_GLES2)
static const GLushort logicOps[] = { static const GLushort logicOps[] = {
GL_CLEAR, GL_CLEAR,
GL_AND, GL_AND,
@ -110,6 +111,7 @@ static const GLushort logicOps[] = {
GL_NAND, GL_NAND,
GL_SET, GL_SET,
}; };
#endif
static GLenum blendColor2Func(u32 fix) { static GLenum blendColor2Func(u32 fix) {
if (fix == 0xFFFFFF) if (fix == 0xFFFFFF)
@ -219,10 +221,12 @@ void TransformDrawEngine::ApplyDrawState(int prim) {
glstate.blendEquation.set(eqLookup[blendFuncEq]); glstate.blendEquation.set(eqLookup[blendFuncEq]);
} }
#if !defined(USING_GLES2)
bool wantLogicOps = !gstate.isModeClear() && gstate.isLogicOpEnabled(); bool wantLogicOps = !gstate.isModeClear() && gstate.isLogicOpEnabled();
glstate.colorLogicOp.set(wantLogicOps); glstate.colorLogicOp.set(wantLogicOps);
if(wantLogicOps) if(wantLogicOps)
glstate.logicOp.set(logicOps[gstate.getLogicOp()]); glstate.logicOp.set(logicOps[gstate.getLogicOp()]);
#endif
// Set Dither // Set Dither
if (gstate.isDitherEnabled()) { if (gstate.isDitherEnabled()) {

2
native

@ -1 +1 @@
Subproject commit f00bfc546401e93803f1b41ba64804247b8ac6c7 Subproject commit d83c2ab94182e41ab1590057b287b72432528550