From b87335957ee579303ff5f590b3abc8fa0fe6cbca Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Wed, 4 Jan 2017 17:26:25 +1100
Subject: [PATCH] [Glide64] enable rotate setting on all systems

---
 Source/Glide64/Main.cpp             | 8 +-------
 Source/Glide64/Settings.cpp         | 2 --
 Source/Glide64/Settings.h           | 2 --
 Source/Glitch64/OGLEScombiner.cpp   | 4 ----
 Source/Glitch64/OGLESgeometry.cpp   | 2 +-
 Source/Glitch64/OGLESglitchmain.cpp | 2 --
 6 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp
index 08f948ddc..59d29c92d 100644
--- a/Source/Glide64/Main.cpp
+++ b/Source/Glide64/Main.cpp
@@ -277,9 +277,7 @@ void UseUnregisteredSetting(int /*SettingID*/)
     DebugBreak();
 #endif
 }
-#ifdef ANDROID
 extern int g_width, g_height;
-#endif
 
 void ReadSettings()
 {
@@ -298,9 +296,7 @@ void ReadSettings()
     g_settings->ssformat = (uint8_t)GetSetting(Set_ssformat);
     g_settings->clock = GetSetting(Set_clock);
     g_settings->clock_24_hr = GetSetting(Set_clock_24_hr);
-#ifdef ANDROID
     g_settings->rotate = GetSetting(Set_Rotate);
-#endif
     g_settings->advanced_options = Set_basic_mode ? !GetSystemSetting(Set_basic_mode) : 0;
     g_settings->texenh_options = GetSetting(Set_texenh_options);
     g_settings->use_hotkeys = GetSetting(Set_hotkeys);
@@ -529,9 +525,7 @@ void WriteSettings(void)
     SetSetting(Set_vsync, g_settings->vsync);
     SetSetting(Set_clock, g_settings->clock);
     SetSetting(Set_clock_24_hr, g_settings->clock_24_hr);
-#ifdef ANDROID
     SetSetting(Set_Rotate, g_settings->rotate);
-#endif
     //SetSetting(Set_advanced_options,g_settings->advanced_options);
     SetSetting(Set_texenh_options, g_settings->texenh_options);
 
@@ -1468,9 +1462,9 @@ void CALL PluginLoaded(void)
 #ifndef ANDROID
     general_setting(Set_wrpFBO, "wrpFBO", 0);
 #else
-    general_setting(Set_Rotate, "rotate", 0);
     general_setting(Set_wrpFBO, "wrpFBO", 1);
 #endif
+    general_setting(Set_Rotate, "rotate", 0);
     general_setting(Set_wrpAnisotropic, "wrpAnisotropic", 0);
     general_setting(Set_autodetect_ucode, "autodetect_ucode", 1);
     general_setting(Set_ucode, "ucode", 2);
diff --git a/Source/Glide64/Settings.cpp b/Source/Glide64/Settings.cpp
index dbd375835..b08114e87 100644
--- a/Source/Glide64/Settings.cpp
+++ b/Source/Glide64/Settings.cpp
@@ -17,9 +17,7 @@ vsync(0),
 
 clock(0),
 clock_24_hr(0),
-#ifdef ANDROID
 rotate(0),
-#endif
 
 filtering(0),
 fog(0),
diff --git a/Source/Glide64/Settings.h b/Source/Glide64/Settings.h
index 17b72b3fa..6db262eb2 100644
--- a/Source/Glide64/Settings.h
+++ b/Source/Glide64/Settings.h
@@ -20,9 +20,7 @@ public:
 
     int clock;
     int clock_24_hr;
-#ifdef ANDROID
     int rotate;
-#endif
 
     int filtering;
     int fog;
diff --git a/Source/Glitch64/OGLEScombiner.cpp b/Source/Glitch64/OGLEScombiner.cpp
index effe26a5a..9df06fb01 100644
--- a/Source/Glitch64/OGLEScombiner.cpp
+++ b/Source/Glitch64/OGLEScombiner.cpp
@@ -348,10 +348,8 @@ void init_combiner()
     glLinkProgram(g_program_object_default);
     check_link(g_program_object_default);
     glUseProgram(g_program_object_default);
-#ifdef ANDROID
     int rotation_matrix_location = glGetUniformLocation(g_program_object_default, "rotation_matrix");
     set_rotation_matrix(rotation_matrix_location, g_settings->rotate);
-#endif
 
     texture0_location = glGetUniformLocation(g_program_object_default, "texture0");
     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);
     }
 
-#ifdef ANDROID
     GLuint rotation_matrix_location = glGetUniformLocation(program_object, "rotation_matrix");
     set_rotation_matrix(rotation_matrix_location, g_settings->rotate);
-#endif
     set_lambda();
 }
 
diff --git a/Source/Glitch64/OGLESgeometry.cpp b/Source/Glitch64/OGLESgeometry.cpp
index 4e50edaf0..6133ee593 100644
--- a/Source/Glitch64/OGLESgeometry.cpp
+++ b/Source/Glitch64/OGLESgeometry.cpp
@@ -394,7 +394,7 @@ FX_ENTRY void FX_CALL
 grDrawTriangle(const void *a, const void *b, const void *c)
 {
     WriteTrace(TraceGlitch, TraceDebug, "start");
-
+    vbo_enable();
     if (nvidia_viewport_hack && !render_to_texture)
     {
         glViewport(0, viewport_offset, viewport_width, viewport_height);
diff --git a/Source/Glitch64/OGLESglitchmain.cpp b/Source/Glitch64/OGLESglitchmain.cpp
index b6ab46c5d..3b690477f 100644
--- a/Source/Glitch64/OGLESglitchmain.cpp
+++ b/Source/Glitch64/OGLESglitchmain.cpp
@@ -1237,8 +1237,6 @@ static void render_rectangle(int texture_number,
     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);
-    int vertexOffset_location;
-    int textureSizes_location;
     static float data[] = {
         (float)((int)dst_x),                      //X 0
         (float)(invert*-((int)dst_y)),            //Y 0