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

[Glide64] enable rotate setting on all systems

This commit is contained in:
zilmar 2017-01-04 17:26:25 +11:00
parent b44e26134d
commit b87335957e
6 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Glide64/Main.cpp
View File

@ -277,9 +277,7 @@ void UseUnregisteredSetting(int /*SettingID*/)
DebugBreak(); DebugBreak();
#endif #endif
} }
#ifdef ANDROID
extern int g_width, g_height; extern int g_width, g_height;
#endif
void ReadSettings() void ReadSettings()
{ {
@ -298,9 +296,7 @@ void ReadSettings()
g_settings->ssformat = (uint8_t)GetSetting(Set_ssformat); g_settings->ssformat = (uint8_t)GetSetting(Set_ssformat);
g_settings->clock = GetSetting(Set_clock); g_settings->clock = GetSetting(Set_clock);
g_settings->clock_24_hr = GetSetting(Set_clock_24_hr); g_settings->clock_24_hr = GetSetting(Set_clock_24_hr);
#ifdef ANDROID
g_settings->rotate = GetSetting(Set_Rotate); g_settings->rotate = GetSetting(Set_Rotate);
#endif
g_settings->advanced_options = Set_basic_mode ? !GetSystemSetting(Set_basic_mode) : 0; g_settings->advanced_options = Set_basic_mode ? !GetSystemSetting(Set_basic_mode) : 0;
g_settings->texenh_options = GetSetting(Set_texenh_options); g_settings->texenh_options = GetSetting(Set_texenh_options);
g_settings->use_hotkeys = GetSetting(Set_hotkeys); g_settings->use_hotkeys = GetSetting(Set_hotkeys);
@ -529,9 +525,7 @@ void WriteSettings(void)
SetSetting(Set_vsync, g_settings->vsync); SetSetting(Set_vsync, g_settings->vsync);
SetSetting(Set_clock, g_settings->clock); SetSetting(Set_clock, g_settings->clock);
SetSetting(Set_clock_24_hr, g_settings->clock_24_hr); SetSetting(Set_clock_24_hr, g_settings->clock_24_hr);
#ifdef ANDROID
SetSetting(Set_Rotate, g_settings->rotate); SetSetting(Set_Rotate, g_settings->rotate);
#endif
//SetSetting(Set_advanced_options,g_settings->advanced_options); //SetSetting(Set_advanced_options,g_settings->advanced_options);
SetSetting(Set_texenh_options, g_settings->texenh_options); SetSetting(Set_texenh_options, g_settings->texenh_options);
@ -1468,9 +1462,9 @@ void CALL PluginLoaded(void)
#ifndef ANDROID #ifndef ANDROID
general_setting(Set_wrpFBO, "wrpFBO", 0); general_setting(Set_wrpFBO, "wrpFBO", 0);
#else #else
general_setting(Set_Rotate, "rotate", 0);
general_setting(Set_wrpFBO, "wrpFBO", 1); general_setting(Set_wrpFBO, "wrpFBO", 1);
#endif #endif
general_setting(Set_Rotate, "rotate", 0);
general_setting(Set_wrpAnisotropic, "wrpAnisotropic", 0); general_setting(Set_wrpAnisotropic, "wrpAnisotropic", 0);
general_setting(Set_autodetect_ucode, "autodetect_ucode", 1); general_setting(Set_autodetect_ucode, "autodetect_ucode", 1);
general_setting(Set_ucode, "ucode", 2); general_setting(Set_ucode, "ucode", 2);

2
Source/Glide64/Settings.cpp
View File

@ -17,9 +17,7 @@ vsync(0),
clock(0), clock(0),
clock_24_hr(0), clock_24_hr(0),
#ifdef ANDROID
rotate(0), rotate(0),
#endif
filtering(0), filtering(0),
fog(0), fog(0),

2
Source/Glide64/Settings.h
View File

@ -20,9 +20,7 @@ public:
int clock; int clock;
int clock_24_hr; int clock_24_hr;
#ifdef ANDROID
int rotate; int rotate;
#endif
int filtering; int filtering;
int fog; int fog;

4
Source/Glitch64/OGLEScombiner.cpp
View File

@ -348,10 +348,8 @@ void init_combiner()
glLinkProgram(g_program_object_default); glLinkProgram(g_program_object_default);
check_link(g_program_object_default); check_link(g_program_object_default);
glUseProgram(g_program_object_default); glUseProgram(g_program_object_default);
#ifdef ANDROID
int rotation_matrix_location = glGetUniformLocation(g_program_object_default, "rotation_matrix"); int rotation_matrix_location = glGetUniformLocation(g_program_object_default, "rotation_matrix");
set_rotation_matrix(rotation_matrix_location, g_settings->rotate); set_rotation_matrix(rotation_matrix_location, g_settings->rotate);
#endif
texture0_location = glGetUniformLocation(g_program_object_default, "texture0"); texture0_location = glGetUniformLocation(g_program_object_default, "texture0");
texture1_location = glGetUniformLocation(g_program_object_default, "texture1"); texture1_location = glGetUniformLocation(g_program_object_default, "texture1");
@ -485,10 +483,8 @@ void update_uniforms(GLuint program_object, const shader_program_key & prog)
glUniform1i(prog.ditherTex_location, 2); glUniform1i(prog.ditherTex_location, 2);
} }
#ifdef ANDROID
GLuint rotation_matrix_location = glGetUniformLocation(program_object, "rotation_matrix"); GLuint rotation_matrix_location = glGetUniformLocation(program_object, "rotation_matrix");
set_rotation_matrix(rotation_matrix_location, g_settings->rotate); set_rotation_matrix(rotation_matrix_location, g_settings->rotate);
#endif
set_lambda(); set_lambda();
} }

2
Source/Glitch64/OGLESgeometry.cpp
View File

@ -394,7 +394,7 @@ FX_ENTRY void FX_CALL
grDrawTriangle(const void *a, const void *b, const void *c) grDrawTriangle(const void *a, const void *b, const void *c)
{ {
WriteTrace(TraceGlitch, TraceDebug, "start"); WriteTrace(TraceGlitch, TraceDebug, "start");
vbo_enable();
if (nvidia_viewport_hack && !render_to_texture) if (nvidia_viewport_hack && !render_to_texture)
{ {
glViewport(0, viewport_offset, viewport_width, viewport_height); glViewport(0, viewport_offset, viewport_width, viewport_height);

2
Source/Glitch64/OGLESglitchmain.cpp
View File

@ -1237,8 +1237,6 @@ static void render_rectangle(int texture_number,
int tex_width, int tex_height, int invert) int tex_width, int tex_height, int invert)
{ {
//LOGINFO("render_rectangle(%d,%d,%d,%d,%d,%d,%d,%d)",texture_number,dst_x,dst_y,src_width,src_height,tex_width,tex_height,invert); //LOGINFO("render_rectangle(%d,%d,%d,%d,%d,%d,%d,%d)",texture_number,dst_x,dst_y,src_width,src_height,tex_width,tex_height,invert);
int vertexOffset_location;
int textureSizes_location;
static float data[] = { static float data[] = {
(float)((int)dst_x), //X 0 (float)((int)dst_x), //X 0
(float)(invert*-((int)dst_y)), //Y 0 (float)(invert*-((int)dst_y)), //Y 0