[Video] Rename grTexMinAddress to gfxTexMinAddress

Source/Project64-video/Config.cpp

@@ -19,6 +19,7 @@
 #include <Common/StdString.h>
 #include <Settings/Settings.h>
 #include "SettingsID.h"
+#include "ScreenResolution.h"
 
 #ifdef _WIN32
 #include <Common/CriticalSection.h>
@@ -274,7 +275,7 @@ public:
 
         m_cmbFSResolution.Attach(GetDlgItem(IDC_CMB_FS_RESOLUTION));
         int32_t size = 0;
-        char ** aRes = grQueryResolutionsExt(&size);
+        const char ** aRes = getFullScreenResList(&size);
         if (aRes && size)
         {
             for (int r = 0; r < size; r++)

Source/Project64-video/Gfx_1.3.h

@@ -17,9 +17,7 @@
 #include <fstream>
 #include <stdlib.h>
 #include <stddef.h>		// offsetof
-#include <glide.h>
 #include <Common/MemTest.h>
-#include "GlideExtensions.h"
 #include "rdp.h"
 #include "Config.h"
 #include "Settings.h"

Source/Project64-video/Main.cpp

@@ -500,7 +500,7 @@ int InitGfx()
     grGet(GR_MAX_TEXTURE_SIZE, 4, (FxI32*)&voodoo.max_tex_size);
     voodoo.sup_large_tex = (voodoo.max_tex_size > 256 && !g_settings->hacks(CSettings::hack_PPL));
 
-    voodoo.tex_min_addr[0] = voodoo.tex_min_addr[1] = grTexMinAddress(GR_TMU0);
+    voodoo.tex_min_addr[0] = voodoo.tex_min_addr[1] = gfxTexMinAddress(GR_TMU0);
     voodoo.tex_max_addr[0] = voodoo.tex_max_addr[1] = grTexMaxAddress(GR_TMU0);
 
     // Is mirroring allowed?

Source/Project64-video/Renderer/OGLESglitchmain.cpp

@@ -708,7 +708,7 @@ FX_ENTRY void FX_CALL grTextureBufferExt(GrChipID_t  		tmu,
         curBufferAddr = pBufferAddress = startAddress + 1;
         pBufferFmt = fmt;
 
-        int rtmu = startAddress < grTexMinAddress(GR_TMU1) ? 0 : 1;
+        int rtmu = startAddress < gfxTexMinAddress(GR_TMU1) ? 0 : 1;
         int size = pBufferWidth*pBufferHeight * 2; //grTexFormatSize(fmt);
         if ((unsigned int)tmu_usage[rtmu].min > pBufferAddress)
             tmu_usage[rtmu].min = pBufferAddress;

Source/Project64-video/Renderer/OGLEStextures.cpp

@@ -22,7 +22,6 @@
 #include <Project64-video/trace.h>
 #include <Project64-video/Renderer/Renderer.h>
 
-
 int TMU_SIZE = 8 * 2048 * 2048;
 static unsigned char* texture = NULL;
 
@@ -139,8 +138,7 @@ void free_textures()
     }
 }
 
-FX_ENTRY FxU32 FX_CALL
-grTexMinAddress(GrChipID_t tmu)
+FxU32 gfxTexMinAddress(GrChipID_t tmu)
 {
     WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu);
     if (UMAmode)

Source/Project64-video/Renderer/OGLglitchmain.cpp

@@ -997,7 +997,7 @@ FX_ENTRY void FX_CALL grTextureBufferExt(GrChipID_t  		tmu,
         curBufferAddr = pBufferAddress = startAddress + 1;
         pBufferFmt = fmt;
 
-        int rtmu = startAddress < grTexMinAddress(GR_TMU1) ? 0 : 1;
+        int rtmu = startAddress < gfxTexMinAddress(GR_TMU1) ? 0 : 1;
         int size = pBufferWidth*pBufferHeight * 2; //grTexFormatSize(fmt);
         if (tmu_usage[rtmu].min > pBufferAddress + 0)
             tmu_usage[rtmu].min = pBufferAddress + 0;

Source/Project64-video/Renderer/OGLtextures.cpp

@@ -139,8 +139,7 @@ void free_textures()
     }
 }
 
-FX_ENTRY FxU32 FX_CALL
-grTexMinAddress(GrChipID_t tmu)
+FxU32 gfxTexMinAddress(GrChipID_t tmu)
 {
     WriteTrace(TraceGlitch, TraceDebug, "tmu = %d", tmu);
     if (UMAmode)

Source/Project64-video/Renderer/Renderer.h

@@ -13,6 +13,10 @@
 ****************************************************************************/
 #pragma once
 #include <Project64-video/Renderer/types.h>
+#include <glide.h>
+#include "../GlideExtensions.h"
+
+FxU32 gfxTexMinAddress(GrChipID_t tmu);
 
 extern uint32_t nbTextureUnits;
 extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;

Source/Project64-video/ScreenResolution.cpp

@@ -88,7 +88,7 @@ void UpdateScreenResolution(int ScreenWidth, int ScreenHeight)
     switch (g_settings->aspectmode())
     {
     case CSettings::Aspect_4x3:
-        g_resolutions.push_back(ResolutionInfo(stdstr_f("%dx%d", ScreenHeight * 4/3, ScreenHeight).c_str(), ScreenHeight * 4 / 3, ScreenHeight, 0, true));
+        g_resolutions.push_back(ResolutionInfo(stdstr_f("%dx%d", ScreenHeight * 4 / 3, ScreenHeight).c_str(), ScreenHeight * 4 / 3, ScreenHeight, 0, true));
         g_resolutions.push_back(ResolutionInfo("960x720", 960, 720, 0, false));
         g_resolutions.push_back(ResolutionInfo("800x600", 800, 600, 0, false));
         g_resolutions.push_back(ResolutionInfo("640x480", 640, 480, 0, false));
@@ -165,9 +165,9 @@ uint32_t GetScreenResHeight(uint32_t index)
 class FullScreenResolutions
 {
 public:
-    FullScreenResolutions() : 
+    FullScreenResolutions() :
         m_dwNumResolutions(0),
-        m_aResolutions(0), 
+        m_aResolutions(0),
         m_aResolutionsStr(0)
     {
     }
@@ -202,14 +202,14 @@ public:
         return m_currentResolutions;
     }
 
-    char ** getResolutionsList(int32_t * Size)
+    const char ** getResolutionsList(int32_t * Size)
     {
         if (m_dwNumResolutions == 0)
         {
             init();
         }
         *Size = (int32_t)m_dwNumResolutions;
-        return m_aResolutionsStr;
+        return (const char **)m_aResolutionsStr;
     }
 
     bool changeDisplaySettings(uint32_t _resolution);
@@ -340,13 +340,13 @@ int GetCurrentResIndex(void)
 }
 
 #ifndef ANDROID
-char ** grQueryResolutionsExt(int32_t * Size)
+const char ** getFullScreenResList(int32_t * Size)
 {
     WriteTrace(TraceGlitch, TraceDebug, "-");
     return g_FullScreenResolutions.getResolutionsList(Size);
 }
 
-uint32_t grWrapperFullScreenResolutionExt(uint32_t * width, uint32_t * height)
+uint32_t getFullScreenRes(uint32_t * width, uint32_t * height)
 {
     WriteTrace(TraceGlitch, TraceDebug, "-");
     g_FullScreenResolutions.getResolution(g_settings->FullScreenRes(), width, height);

Source/Project64-video/ScreenResolution.h

@@ -13,7 +13,11 @@
 
 #ifdef ANDROID
 void UpdateScreenResolution(int ScreenWidth, int ScreenHeight);
+#else
+const char ** getFullScreenResList(int32_t * Size);
+uint32_t getFullScreenRes(uint32_t * width, uint32_t * height);
 #endif
+
 uint32_t GetScreenResolutionCount();
 uint32_t GetDefaultScreenRes();
 uint32_t GetScreenResWidth(uint32_t index);