[Glide64] Remove some unneeded code

Source/Glide64/Combine.cpp

@@ -619,25 +619,7 @@ COMBINE cmb;
   cmb.tmu0_a_fac = GR_COMBINE_FACTOR_DETAIL_FACTOR, \
   percent = (float)(rdp.env_color&0xFF) / 255.0f, \
   cmb.dc0_detailmax = cmb.dc1_detailmax = percent
-
+ 
-// Bright red, sets up a bright red combine
-#ifdef BRIGHT_RED
-// Bright red, sets up a bright red combine during the alpha stage
-#define BrightRed() { \
-  CCMB (GR_COMBINE_FUNCTION_LOCAL, \
-  GR_COMBINE_FACTOR_NONE, \
-  GR_COMBINE_LOCAL_CONSTANT, \
-  GR_COMBINE_OTHER_NONE); \
-  ACMB (GR_COMBINE_FUNCTION_LOCAL, \
-  GR_COMBINE_FACTOR_NONE, \
-  GR_COMBINE_LOCAL_CONSTANT, \
-  GR_COMBINE_OTHER_NONE); \
-  cmb.ccolor = 0xFF0000FF; \
-}
-#else
-#define BrightRed()
-#endif
-
 #define CC(color) cmb.ccolor=(color)&0xFFFFFF00
 #define CC_BYTE(byte) { cmb.ccolor=(byte<<8)|(byte<<16)|(byte<<24); }
 #define CC_C1MULC2(color1, color2) { \
@@ -15659,15 +15641,8 @@ void Combine()
                 Alpha0[(rdp.cycle1 >> 16) & 7], Alpha1[(rdp.cycle1 >> 19) & 7], Alpha2[(rdp.cycle1 >> 22) & 7], Alpha3[(rdp.cycle1 >> 25) & 7],
                 Alpha0[(rdp.cycle2 >> 16) & 7], Alpha1[(rdp.cycle2 >> 19) & 7], Alpha2[(rdp.cycle2 >> 22) & 7], Alpha3[(rdp.cycle2 >> 25) & 7]);
         }
-        if (g_settings->unk_as_red())
+        // use full alpha as default
-        {
+        ac_t0();
-            BrightRed();
-        }
-        else
-        {
-            // use full alpha as default
-            ac_t0();
-        }
     }
     else
     {

Source/Glide64/Gfx_1.3.h

@@ -102,17 +102,9 @@ extern "C" {
 
     // ********************************
 
-#define LOGNOTKEY			 // Log if not pressing:
-#define LOGKEY		0x11 // this key (CONTROL)
-
-#define LOG_COMMANDS		// log the whole 64-bit command as (0x........, 0x........)
-
     //#define CATCH_EXCEPTIONS	// catch exceptions so it doesn't freeze and will report
     // "The gfx plugin has caused an exception" instead.
 
-#define FLUSH				// flush the file buffer. slower logging, but makes sure
-    //  the command is logged before continuing (in case of
-    //  crash or exception, the log will not be cut short)
 #ifndef _ENDUSER_RELEASE_
 
 #endif
@@ -128,22 +120,12 @@ extern "C" {
     //#define SIMULATE_BANSHEE
     //********
 
-#ifndef _ENDUSER_RELEASE_
-#define BRIGHT_RED			// Keep enabled, option in dialog
-#endif
-
-#define COLORED_DEBUGGER	// ;) pretty colors
-
-    // rdram mask at 0x400000 bytes (bah, not right for majora's mask)
-    //#define BMASK	0x7FFFFF
     extern unsigned int BMASK;
 #define WMASK	0x3FFFFF
 #define DMASK	0x1FFFFF
 
     extern uint32_t update_screen_count;
 
-    int CheckKeyPressed(int key, int mask);
-
     //#define PERFORMANCE
 #ifdef PERFORMANCE
     extern int64 perf_cur;

Source/Glide64/Settings.cpp

@@ -116,7 +116,6 @@ void CSettings::RegisterSettings(void)
     general_setting(Set_ucode, "ucode", ucode_F3DEX2);
     general_setting(Set_wireframe, "wireframe", false);
     general_setting(Set_wfmode, "wfmode", wfmode_VertexColors);
-    general_setting(Set_unk_as_red, "unk_as_red", false);
     general_setting(Set_ghq_fltr, "ghq_fltr", TextureFilter_None);
     general_setting(Set_ghq_cmpr, "ghq_cmpr", TextureCompression_S3TC);
     general_setting(Set_ghq_enht, "ghq_enht", TextureEnht_None);
@@ -233,17 +232,14 @@ void CSettings::UpdateScreenSize(bool fullscreen)
     }
     else
     {
+#endif
         g_width = GetScreenResWidth(m_ScreenRes);
         g_height = GetScreenResHeight(m_ScreenRes);
+#ifndef ANDROID
     }
-    m_scr_res_x = m_res_x = g_width;
-    m_scr_res_y = m_res_y = g_height;
-#else
-    g_width = GetScreenResWidth(m_ScreenRes);
-    g_height = GetScreenResHeight(m_ScreenRes);
-    m_scr_res_x = m_res_x = g_width;
-    m_scr_res_y = m_res_y = g_height;
 #endif
+    m_scr_res_x = m_res_x = g_width;
+    m_scr_res_y = m_res_y = g_height;
     UpdateAspectRatio();
 }
 

Source/Glide64/SettingsID.h

@@ -15,8 +15,7 @@ enum
     // General Settings
     Set_vsync, Set_Rotate, Set_texenh_options, Set_wrpVRAM,
     Set_wrpFBO, Set_wrpAnisotropic, Set_autodetect_ucode, Set_ucode, Set_wireframe,
-    Set_wfmode, Set_unk_as_red, Set_ghq_fltr,
+    Set_wfmode, Set_ghq_fltr, Set_ghq_cmpr, Set_ghq_enht, Set_ghq_hirs, Set_ghq_enht_cmpr,
-    Set_ghq_cmpr, Set_ghq_enht, Set_ghq_hirs, Set_ghq_enht_cmpr,
     Set_ghq_enht_f16bpp, Set_ghq_enht_gz, Set_ghq_enht_nobg, Set_ghq_hirs_cmpr,
     Set_ghq_hirs_tile, Set_ghq_hirs_f16bpp, Set_ghq_hirs_gz, Set_ghq_hirs_altcrc,
     Set_ghq_cache_save, Set_ghq_cache_size, Set_ghq_hirs_let_texartists_fly,

Source/Glide64/rdp.h

@@ -164,7 +164,6 @@ typedef struct {
     uint32_t lr_y;
 } SCISSOR;
 
-
 typedef struct {
     uint16_t tile_ul_s;
     uint16_t tile_ul_t;

Source/GlideHQ/TxHiResCache.cpp

@@ -146,8 +146,6 @@ TxHiResCache::load(boolean replace) /* 0 : reload, 1 : replace partial */
 
         switch (_options & HIRESTEXTURES_MASK)
         {
-        case GHQ_HIRESTEXTURES:
-            break;
         case RICE_HIRESTEXTURES:
             INFO(80, "-----\n");
             INFO(80, "using Rice hires texture format...\n");
@@ -163,8 +161,6 @@ TxHiResCache::load(boolean replace) /* 0 : reload, 1 : replace partial */
             dir_path.AppendDirectory(_ident.c_str());
             loadHiResTextures(dir_path, replace);
             break;
-        case JABO_HIRESTEXTURES:
-            ;
         }
 
         return 1;