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

CommonSettings: Remove the now obsolete GFX3D_Renderer_Multisample setting. (Related to commit 94ddf1a.)

This commit is contained in:
rogerman 2018-10-25 00:35:22 -07:00
parent 3cc4a64b69
commit 064527e24e
5 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/NDSSystem.h
View File

@ -531,7 +531,6 @@ extern struct TCommonSettings
, GFX3D_Fog(true) , GFX3D_Fog(true)
, GFX3D_Texture(true) , GFX3D_Texture(true)
, GFX3D_LineHack(true) , GFX3D_LineHack(true)
, GFX3D_Renderer_Multisample(false)
, GFX3D_Renderer_MultisampleSize(0) , GFX3D_Renderer_MultisampleSize(0)
, GFX3D_Renderer_TextureScalingFactor(1) // Possible values: 1, 2, 4 , GFX3D_Renderer_TextureScalingFactor(1) // Possible values: 1, 2, 4
, GFX3D_Renderer_TextureDeposterize(false) , GFX3D_Renderer_TextureDeposterize(false)
@ -591,7 +590,6 @@ extern struct TCommonSettings
bool GFX3D_Fog; bool GFX3D_Fog;
bool GFX3D_Texture; bool GFX3D_Texture;
bool GFX3D_LineHack; bool GFX3D_LineHack;
bool GFX3D_Renderer_Multisample;
int GFX3D_Renderer_MultisampleSize; int GFX3D_Renderer_MultisampleSize;
int GFX3D_Renderer_TextureScalingFactor; //must be one of {1,2,4} int GFX3D_Renderer_TextureScalingFactor; //must be one of {1,2,4}
bool GFX3D_Renderer_TextureDeposterize; bool GFX3D_Renderer_TextureDeposterize;

2
desmume/src/frontend/cocoa/DefaultUserPrefs.plist
View File

@ -740,8 +740,6 @@
<true/> <true/>
<key>Render3D_LineHack</key> <key>Render3D_LineHack</key>
<true/> <true/>
<key>Render3D_Multisample</key>
<false/>
<key>Render3D_MultisampleSize</key> <key>Render3D_MultisampleSize</key>
<integer>0</integer> <integer>0</integer>
<key>Render3D_RenderingEngine</key> <key>Render3D_RenderingEngine</key>

1
desmume/src/frontend/cocoa/cocoa_GPU.h
View File

@ -162,7 +162,6 @@ typedef std::map<CGDirectDisplayID, int64_t> DisplayLinkFlushTimeLimitMap;
@property (assign) BOOL render3DTextures; @property (assign) BOOL render3DTextures;
@property (assign) NSUInteger render3DThreads; @property (assign) NSUInteger render3DThreads;
@property (assign) BOOL render3DLineHack; @property (assign) BOOL render3DLineHack;
@property (assign) BOOL render3DMultisample;
@property (assign) NSUInteger render3DMultisampleSize; @property (assign) NSUInteger render3DMultisampleSize;
@property (retain) NSString *render3DMultisampleSizeString; @property (retain) NSString *render3DMultisampleSizeString;
@property (assign) BOOL render3DTextureDeposterize; @property (assign) BOOL render3DTextureDeposterize;

17
desmume/src/frontend/cocoa/cocoa_GPU.mm
View File

@ -115,7 +115,6 @@ public:
@dynamic render3DTextures; @dynamic render3DTextures;
@dynamic render3DThreads; @dynamic render3DThreads;
@dynamic render3DLineHack; @dynamic render3DLineHack;
@dynamic render3DMultisample;
@dynamic render3DMultisampleSize; @dynamic render3DMultisampleSize;
@synthesize render3DMultisampleSizeString; @synthesize render3DMultisampleSizeString;
@dynamic render3DTextureDeposterize; @dynamic render3DTextureDeposterize;
@ -530,22 +529,6 @@ public:
return state; return state;
} }
- (void) setRender3DMultisample:(BOOL)state
{
gpuEvent->ApplyRender3DSettingsLock();
CommonSettings.GFX3D_Renderer_Multisample = state ? true : false;
gpuEvent->ApplyRender3DSettingsUnlock();
}
- (BOOL) render3DMultisample
{
gpuEvent->ApplyRender3DSettingsLock();
const BOOL state = CommonSettings.GFX3D_Renderer_Multisample ? YES : NO;
gpuEvent->ApplyRender3DSettingsUnlock();
return state;
}
- (void) setRender3DMultisampleSize:(NSUInteger)msaaSize - (void) setRender3DMultisampleSize:(NSUInteger)msaaSize
{ {
gpuEvent->ApplyRender3DSettingsLock(); gpuEvent->ApplyRender3DSettingsLock();

2
desmume/src/frontend/windows/main.cpp
View File

@ -2378,7 +2378,6 @@ int _main()
CommonSettings.GFX3D_Texture = GetPrivateProfileBool("3D", "EnableTexture", 1, IniName); CommonSettings.GFX3D_Texture = GetPrivateProfileBool("3D", "EnableTexture", 1, IniName);
CommonSettings.GFX3D_LineHack = GetPrivateProfileBool("3D", "EnableLineHack", 1, IniName); CommonSettings.GFX3D_LineHack = GetPrivateProfileBool("3D", "EnableLineHack", 1, IniName);
CommonSettings.GFX3D_TXTHack = GetPrivateProfileBool("3D", "EnableTXTHack", 0, IniName); //default is off. CommonSettings.GFX3D_TXTHack = GetPrivateProfileBool("3D", "EnableTXTHack", 0, IniName); //default is off.
CommonSettings.GFX3D_Renderer_Multisample = GetPrivateProfileBool("3D", "EnableAntiAliasing", 0, IniName);
CommonSettings.GFX3D_Renderer_MultisampleSize = GetPrivateProfileInt("3D", "MultisampleSize", 0, IniName); CommonSettings.GFX3D_Renderer_MultisampleSize = GetPrivateProfileInt("3D", "MultisampleSize", 0, IniName);
CheckValidMSAA(CommonSettings.GFX3D_Renderer_MultisampleSize); CheckValidMSAA(CommonSettings.GFX3D_Renderer_MultisampleSize);
Change3DCoreWithFallbackAndSave(cur3DCore); Change3DCoreWithFallbackAndSave(cur3DCore);
@ -5807,7 +5806,6 @@ LRESULT CALLBACK GFX3DSettingsDlgProc(HWND hw, UINT msg, WPARAM wp, LPARAM lp)
WritePrivateProfileBool("3D", "EnableFog", CommonSettings.GFX3D_Fog, IniName); WritePrivateProfileBool("3D", "EnableFog", CommonSettings.GFX3D_Fog, IniName);
WritePrivateProfileBool("3D", "EnableTexture", CommonSettings.GFX3D_Texture, IniName); WritePrivateProfileBool("3D", "EnableTexture", CommonSettings.GFX3D_Texture, IniName);
WritePrivateProfileInt ("3D", "EnableLineHack", CommonSettings.GFX3D_LineHack, IniName); WritePrivateProfileInt ("3D", "EnableLineHack", CommonSettings.GFX3D_LineHack, IniName);
WritePrivateProfileInt ("3D", "EnableAntiAliasing", CommonSettings.GFX3D_Renderer_Multisample, IniName);
WritePrivateProfileInt ("3D", "MultisampleSize", CommonSettings.GFX3D_Renderer_MultisampleSize, IniName); WritePrivateProfileInt ("3D", "MultisampleSize", CommonSettings.GFX3D_Renderer_MultisampleSize, IniName);
WritePrivateProfileInt ("3D", "EnableTXTHack", CommonSettings.GFX3D_TXTHack, IniName); WritePrivateProfileInt ("3D", "EnableTXTHack", CommonSettings.GFX3D_TXTHack, IniName);
WritePrivateProfileInt ("3D", "PrescaleHD", video.prescaleHD, IniName); WritePrivateProfileInt ("3D", "PrescaleHD", video.prescaleHD, IniName);