ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video] Fix up building on android

This commit is contained in:
zilmar 2017-08-07 17:25:38 +10:00
parent d425d47778
commit 96306c0ee2
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Project64-video/Project64-video.vcxproj
View File

@ -49,6 +49,7 @@
<ItemGroup>
<ClInclude Include="F3DTEXA.h" />
<ClInclude Include="Gfx_1.3.h" />
<ClInclude Include="Renderer\glitchmain.h" />
<ClInclude Include="Renderer\Renderer.h" />
<ClInclude Include="Renderer\types.h" />
<ClInclude Include="ScreenResolution.h" />

3
Source/Project64-video/Project64-video.vcxproj.filters
View File

@ -163,6 +163,9 @@
<ClInclude Include="F3DTEXA.h">
<Filter>ucode</Filter>
</ClInclude>
<ClInclude Include="Renderer\glitchmain.h">
<Filter>Renderer</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="CRC.cpp">

5
Source/Project64-video/Renderer/OGLEScombiner.cpp
View File

@ -30,7 +30,8 @@
void vbo_draw();
static int g_alpha_ref, g_alpha_func;
static gfxCmpFnc_t g_alpha_func;
static int g_alpha_ref;
static bool g_alpha_test = 0;
static float g_texture_env_color[4];
@ -605,7 +606,7 @@ void free_combiners()
g_shader_programs.clear();
g_alpha_ref = 0;
g_alpha_func = 0;
g_alpha_func = GFX_CMP_NEVER;
g_alpha_test = 0;
memset(g_texture_env_color, 0, sizeof(g_texture_env_color));

4
Source/Project64-video/Renderer/OGLESglitchmain.cpp
View File

@ -936,7 +936,7 @@ uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params)
params[0] = 256;
return 4;
break;
case GFX_FOG_TABLE_ENTRIES:
case GR_FOG_TABLE_ENTRIES:
if (plength < 4 || params == NULL) return 0;
params[0] = 64;
return 4;
@ -953,7 +953,7 @@ uint32_t gfxGet(uint32_t pname, uint32_t plength, FxI32 *params)
params[1] = 65535;
return 8;
break;
case GFX_LFB_PIXEL_PIPE:
case GR_LFB_PIXEL_PIPE:
if (plength < 4 || params == NULL) return 0;
params[0] = FXFALSE;
return 4;

1
Source/Project64-video/Renderer/glitchmain.h
View File

@ -24,6 +24,7 @@ extern int dumping;
#endif
#include <Project64-video/trace.h>
#include "types.h"
#define zscale 1.0f