From 5cf68a2f764793307ae14b5f38ac17db5fe4c772 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Sun, 13 Mar 2011 23:36:20 -0700 Subject: [PATCH] [opengl] Remove all references to RageDisplay_OGL (changed to _Legacy). Start removing old D3D stuff. --- Xcode/stepmania.xcodeproj/project.pbxproj | 44 +++---- src/RageDisplay_Legacy.cpp | 150 +++++++++++----------- src/RageDisplay_Legacy.h | 10 +- src/RageDisplay_Legacy_Helpers.cpp | 6 +- src/RageDisplay_Legacy_Helpers.h | 4 +- src/StepMania.cpp | 42 +++--- 6 files changed, 128 insertions(+), 128 deletions(-) diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj index a218726db4..991b353a78 100644 --- a/Xcode/stepmania.xcodeproj/project.pbxproj +++ b/Xcode/stepmania.xcodeproj/project.pbxproj @@ -238,7 +238,6 @@ AA29CDF60558741A00961A51 /* SongCacheIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01DE04772005005F316C /* SongCacheIndex.cpp */; }; AA29CDF70558741A00961A51 /* Song.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01E20477205A005F316C /* Song.cpp */; }; AA29CDF80558741A00961A51 /* RandomSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01E6047720A3005F316C /* RandomSample.cpp */; }; - AA29CDF90558741A00961A51 /* RageDisplay_OGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC23F7C0485E68D005F316C /* RageDisplay_OGL.cpp */; }; AA29CDFA0558741A00961A51 /* RageUtil_CharConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC23F7E0485E68D005F316C /* RageUtil_CharConversions.cpp */; }; AA29CDFB0558741A00961A51 /* BannerCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AABE35EB04967E25005F316C /* BannerCache.cpp */; }; AA29CDFE0558741A00961A51 /* ScreenSelectMaster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA1DC47404A4861700D02EE9 /* ScreenSelectMaster.cpp */; }; @@ -456,7 +455,6 @@ AA40D25909A08D650068C0D5 /* LowLevelWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01630477136A005F316C /* LowLevelWindow.h */; }; AA40D25A09A08D650068C0D5 /* SongCacheIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01DF04772005005F316C /* SongCacheIndex.h */; }; AA40D25C09A08D650068C0D5 /* RandomSample.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6E01E7047720A3005F316C /* RandomSample.h */; }; - AA40D25D09A08D650068C0D5 /* RageDisplay_OGL.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC23F7D0485E68D005F316C /* RageDisplay_OGL.h */; }; AA40D25E09A08D650068C0D5 /* RageUtil_CharConversions.h in Headers */ = {isa = PBXBuildFile; fileRef = AAC23F7F0485E68D005F316C /* RageUtil_CharConversions.h */; }; AA40D25F09A08D650068C0D5 /* BannerCache.h in Headers */ = {isa = PBXBuildFile; fileRef = AABE35EC04967E26005F316C /* BannerCache.h */; }; AA40D26109A08D650068C0D5 /* arch_default.h in Headers */ = {isa = PBXBuildFile; fileRef = AABE36F60497CE16005F316C /* arch_default.h */; }; @@ -788,7 +786,6 @@ AA40D41809A08D650068C0D5 /* SongCacheIndex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01DE04772005005F316C /* SongCacheIndex.cpp */; }; AA40D41909A08D650068C0D5 /* Song.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01E20477205A005F316C /* Song.cpp */; }; AA40D41A09A08D650068C0D5 /* RandomSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA6E01E6047720A3005F316C /* RandomSample.cpp */; }; - AA40D41B09A08D650068C0D5 /* RageDisplay_OGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC23F7C0485E68D005F316C /* RageDisplay_OGL.cpp */; }; AA40D41C09A08D650068C0D5 /* RageUtil_CharConversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAC23F7E0485E68D005F316C /* RageUtil_CharConversions.cpp */; }; AA40D41D09A08D650068C0D5 /* BannerCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AABE35EB04967E25005F316C /* BannerCache.cpp */; }; AA40D42009A08D650068C0D5 /* ScreenSelectMaster.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA1DC47404A4861700D02EE9 /* ScreenSelectMaster.cpp */; }; @@ -1351,9 +1348,6 @@ AA80C75407F20D0D00C99272 /* UnlockManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA80C75207F20D0D00C99272 /* UnlockManager.cpp */; }; AA80C75907F20D6600C99272 /* OptionRowHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA80C75707F20D6600C99272 /* OptionRowHandler.cpp */; }; AA80C75C07F20D8000C99272 /* ScreenMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA80C75B07F20D7F00C99272 /* ScreenMessage.cpp */; }; - AA8122E20A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8122E00A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp */; }; - AA8122E40A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8122E00A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp */; }; - AA8122E50A7499F5002E1D1A /* RageDisplay_OGL_Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = AA8122E10A7499F5002E1D1A /* RageDisplay_OGL_Helpers.h */; }; AA84B7070996F8370085EECB /* AdjustSync.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA84B7050996F8370085EECB /* AdjustSync.cpp */; }; AA8A3E6406EDCD11002F25AB /* DarwinThreadHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8A3E6306EDCD11002F25AB /* DarwinThreadHelpers.cpp */; }; AA8A405106EEFF72002F25AB /* RageUtil_BackgroundLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8A404F06EEFF72002F25AB /* RageUtil_BackgroundLoader.cpp */; }; @@ -1633,6 +1627,10 @@ AAFF41A60F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = AAFF41A20F5BD4AD00FFDB67 /* ScreenOptionsExportPackage.h */; }; EE2153A910A75BEE0074B01B /* NotesLoaderPMS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */; }; EE2153AA10A75BEE0074B01B /* NotesLoaderPMS.h in Headers */ = {isa = PBXBuildFile; fileRef = EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */; }; + EE879B60132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE879B5C132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp */; }; + EE879B61132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = EE879B5D132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h */; }; + EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE879B5E132DEE720078FDDC /* RageDisplay_Legacy.cpp */; }; + EE879B63132DEE720078FDDC /* RageDisplay_Legacy.h in Headers */ = {isa = PBXBuildFile; fileRef = EE879B5F132DEE720078FDDC /* RageDisplay_Legacy.h */; }; EE906F6612BF3A1B00146C96 /* ScreenInstallOverlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */; }; EE906F6712BF3A1B00146C96 /* ScreenInstallOverlay.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */; }; EE906F7712BF3A6900146C96 /* json_batchallocator.h in Headers */ = {isa = PBXBuildFile; fileRef = EE906F7012BF3A6900146C96 /* json_batchallocator.h */; }; @@ -2573,8 +2571,6 @@ AA80C75707F20D6600C99272 /* OptionRowHandler.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = OptionRowHandler.cpp; path = ../src/OptionRowHandler.cpp; sourceTree = ""; }; AA80C75807F20D6600C99272 /* OptionRowHandler.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = OptionRowHandler.h; path = ../src/OptionRowHandler.h; sourceTree = ""; }; AA80C75B07F20D7F00C99272 /* ScreenMessage.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = ScreenMessage.cpp; path = ../src/ScreenMessage.cpp; sourceTree = ""; }; - AA8122E00A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = RageDisplay_OGL_Helpers.cpp; path = ../src/RageDisplay_OGL_Helpers.cpp; sourceTree = ""; }; - AA8122E10A7499F5002E1D1A /* RageDisplay_OGL_Helpers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RageDisplay_OGL_Helpers.h; path = ../src/RageDisplay_OGL_Helpers.h; sourceTree = ""; }; AA84B7050996F8370085EECB /* AdjustSync.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = AdjustSync.cpp; path = ../src/AdjustSync.cpp; sourceTree = ""; }; AA84B7060996F8370085EECB /* AdjustSync.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AdjustSync.h; path = ../src/AdjustSync.h; sourceTree = ""; }; AA8A3E6306EDCD11002F25AB /* DarwinThreadHelpers.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; path = DarwinThreadHelpers.cpp; sourceTree = ""; }; @@ -2760,8 +2756,6 @@ AAC0BFE00E2951EC00F56EEB /* CryptHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CryptHelpers.h; path = ../src/CryptHelpers.h; sourceTree = SOURCE_ROOT; }; AAC0C8C00984AE3B0075FC53 /* Tween.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Tween.cpp; path = ../src/Tween.cpp; sourceTree = ""; }; AAC0C8C10984AE3B0075FC53 /* Tween.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Tween.h; path = ../src/Tween.h; sourceTree = ""; }; - AAC23F7C0485E68D005F316C /* RageDisplay_OGL.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageDisplay_OGL.cpp; path = ../src/RageDisplay_OGL.cpp; sourceTree = ""; }; - AAC23F7D0485E68D005F316C /* RageDisplay_OGL.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageDisplay_OGL.h; path = ../src/RageDisplay_OGL.h; sourceTree = ""; }; AAC23F7E0485E68D005F316C /* RageUtil_CharConversions.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = RageUtil_CharConversions.cpp; path = ../src/RageUtil_CharConversions.cpp; sourceTree = ""; }; AAC23F7F0485E68D005F316C /* RageUtil_CharConversions.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = RageUtil_CharConversions.h; path = ../src/RageUtil_CharConversions.h; sourceTree = ""; }; AAC28BB904F758E500D02EE9 /* BeginnerHelper.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; name = BeginnerHelper.cpp; path = ../src/BeginnerHelper.cpp; sourceTree = ""; }; @@ -2974,6 +2968,10 @@ AAFF5542054E736D00D02EE9 /* Attack.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; name = Attack.h; path = ../src/Attack.h; sourceTree = ""; }; EE2153A710A75BEE0074B01B /* NotesLoaderPMS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NotesLoaderPMS.cpp; path = ../src/NotesLoaderPMS.cpp; sourceTree = SOURCE_ROOT; }; EE2153A810A75BEE0074B01B /* NotesLoaderPMS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NotesLoaderPMS.h; path = ../src/NotesLoaderPMS.h; sourceTree = SOURCE_ROOT; }; + EE879B5C132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RageDisplay_Legacy_Helpers.cpp; path = ../src/RageDisplay_Legacy_Helpers.cpp; sourceTree = SOURCE_ROOT; }; + EE879B5D132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RageDisplay_Legacy_Helpers.h; path = ../src/RageDisplay_Legacy_Helpers.h; sourceTree = SOURCE_ROOT; }; + EE879B5E132DEE720078FDDC /* RageDisplay_Legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RageDisplay_Legacy.cpp; path = ../src/RageDisplay_Legacy.cpp; sourceTree = SOURCE_ROOT; }; + EE879B5F132DEE720078FDDC /* RageDisplay_Legacy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RageDisplay_Legacy.h; path = ../src/RageDisplay_Legacy.h; sourceTree = SOURCE_ROOT; }; EE906F6412BF3A1B00146C96 /* ScreenInstallOverlay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScreenInstallOverlay.cpp; path = ../src/ScreenInstallOverlay.cpp; sourceTree = SOURCE_ROOT; }; EE906F6512BF3A1B00146C96 /* ScreenInstallOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScreenInstallOverlay.h; path = ../src/ScreenInstallOverlay.h; sourceTree = SOURCE_ROOT; }; EE906F7012BF3A6900146C96 /* json_batchallocator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = json_batchallocator.h; path = ../src/jsoncpp/src/lib_json/json_batchallocator.h; sourceTree = SOURCE_ROOT; }; @@ -3554,16 +3552,12 @@ AA6EFD6E04770A7C005F316C /* RageBitmapTexture.h */, AA6EFD6F04770A7C005F316C /* RageDisplay.cpp */, AA6EFD7004770A7C005F316C /* RageDisplay.h */, - 36C6887F11297FFE00453295 /* RageFileDriverReadAhead.cpp */, - 36C6888011297FFE00453295 /* RageFileDriverReadAhead.h */, - 36C6888111297FFE00453295 /* RageFileManager_ReadAhead.cpp */, - 36C6888211297FFE00453295 /* RageFileManager_ReadAhead.h */, + EE879B5E132DEE720078FDDC /* RageDisplay_Legacy.cpp */, + EE879B5F132DEE720078FDDC /* RageDisplay_Legacy.h */, + EE879B5C132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp */, + EE879B5D132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h */, AAF7458E061181F700B19AD1 /* RageDisplay_Null.cpp */, AAF7458F061181F700B19AD1 /* RageDisplay_Null.h */, - AAC23F7C0485E68D005F316C /* RageDisplay_OGL.cpp */, - AAC23F7D0485E68D005F316C /* RageDisplay_OGL.h */, - AA8122E00A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp */, - AA8122E10A7499F5002E1D1A /* RageDisplay_OGL_Helpers.h */, AA6EFD7204770A7C005F316C /* RageException.cpp */, AA6EFD7304770A7C005F316C /* RageException.h */, AA272C3004CD757100D02EE9 /* RageFile.cpp */, @@ -3580,12 +3574,16 @@ AABE322305ACDA52001A0E84 /* RageFileDriverDirectHelpers.h */, AA64218606EC606F00C21584 /* RageFileDriverMemory.cpp */, AA64218706EC606F00C21584 /* RageFileDriverMemory.h */, + 36C6887F11297FFE00453295 /* RageFileDriverReadAhead.cpp */, + 36C6888011297FFE00453295 /* RageFileDriverReadAhead.h */, AA0E04D2076C4CD500716D81 /* RageFileDriverSlice.cpp */, AA0E04D3076C4CD500716D81 /* RageFileDriverSlice.h */, AACA592A07B5E23400763545 /* RageFileDriverTimeout.cpp */, AACA592B07B5E23400763545 /* RageFileDriverTimeout.h */, AA251B7505841FCE00027ACB /* RageFileDriverZip.cpp */, AA251B7605841FCE00027ACB /* RageFileDriverZip.h */, + 36C6888111297FFE00453295 /* RageFileManager_ReadAhead.cpp */, + 36C6888211297FFE00453295 /* RageFileManager_ReadAhead.h */, AA6EFD7604770A7C005F316C /* RageInputDevice.cpp */, AA6EFD7704770A7C005F316C /* RageInputDevice.h */, AA6EFD7A04770A7C005F316C /* RageMath.cpp */, @@ -4935,6 +4933,8 @@ 2BA7925F1304F20D002BD8E1 /* NotesLoaderSSC.h in Headers */, 2BA792611304F20D002BD8E1 /* NotesWriterSSC.h in Headers */, 2B30D6831315EA7E00044B68 /* MouseDevice.h in Headers */, + EE879B61132DEE720078FDDC /* RageDisplay_Legacy_Helpers.h in Headers */, + EE879B63132DEE720078FDDC /* RageDisplay_Legacy.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5081,7 +5081,6 @@ AA40D25909A08D650068C0D5 /* LowLevelWindow.h in Headers */, AA40D25A09A08D650068C0D5 /* SongCacheIndex.h in Headers */, AA40D25C09A08D650068C0D5 /* RandomSample.h in Headers */, - AA40D25D09A08D650068C0D5 /* RageDisplay_OGL.h in Headers */, AA40D25E09A08D650068C0D5 /* RageUtil_CharConversions.h in Headers */, AA40D25F09A08D650068C0D5 /* BannerCache.h in Headers */, AA40D26109A08D650068C0D5 /* arch_default.h in Headers */, @@ -5290,7 +5289,6 @@ AA8CF5190A4518BE0005F1B4 /* RageSoundDriver_AU.h in Headers */, AAD8F9340A4B97DF000311CF /* ScreenGameplayShared.h in Headers */, AAAA11C80A662F9D00B2BD88 /* ScoreKeeperShared.h in Headers */, - AA8122E50A7499F5002E1D1A /* RageDisplay_OGL_Helpers.h in Headers */, AA2EA0040A770208003A0C11 /* ScreenSelectLanguage.h in Headers */, AA5D165A0A79805C00F17E86 /* RageTextureRenderTarget.h in Headers */, AA5D166F0A798C0E00F17E86 /* ActorFrameTexture.h in Headers */, @@ -5905,7 +5903,6 @@ AA29CDF60558741A00961A51 /* SongCacheIndex.cpp in Sources */, AA29CDF70558741A00961A51 /* Song.cpp in Sources */, AA29CDF80558741A00961A51 /* RandomSample.cpp in Sources */, - AA29CDF90558741A00961A51 /* RageDisplay_OGL.cpp in Sources */, AA29CDFA0558741A00961A51 /* RageUtil_CharConversions.cpp in Sources */, AA29CDFB0558741A00961A51 /* BannerCache.cpp in Sources */, AA29CDFE0558741A00961A51 /* ScreenSelectMaster.cpp in Sources */, @@ -6110,7 +6107,6 @@ AAD8F9370A4B97DF000311CF /* ScreenGameplayShared.cpp in Sources */, AAAA11C70A662F9D00B2BD88 /* ScoreKeeperShared.cpp in Sources */, AAE2D6D40A67481E00071546 /* ScoreKeeper.cpp in Sources */, - AA8122E20A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp in Sources */, AA2EA0010A770208003A0C11 /* ScreenSelectLanguage.cpp in Sources */, AA5D16570A79805C00F17E86 /* RageTextureRenderTarget.cpp in Sources */, AA5D166C0A798C0E00F17E86 /* ActorFrameTexture.cpp in Sources */, @@ -6180,6 +6176,8 @@ 2BA7925E1304F20D002BD8E1 /* NotesLoaderSSC.cpp in Sources */, 2BA792601304F20D002BD8E1 /* NotesWriterSSC.cpp in Sources */, 2B30D6821315EA7E00044B68 /* MouseDevice.cpp in Sources */, + EE879B60132DEE720078FDDC /* RageDisplay_Legacy_Helpers.cpp in Sources */, + EE879B62132DEE720078FDDC /* RageDisplay_Legacy.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -6317,7 +6315,6 @@ AA40D41809A08D650068C0D5 /* SongCacheIndex.cpp in Sources */, AA40D41909A08D650068C0D5 /* Song.cpp in Sources */, AA40D41A09A08D650068C0D5 /* RandomSample.cpp in Sources */, - AA40D41B09A08D650068C0D5 /* RageDisplay_OGL.cpp in Sources */, AA40D41C09A08D650068C0D5 /* RageUtil_CharConversions.cpp in Sources */, AA40D41D09A08D650068C0D5 /* BannerCache.cpp in Sources */, AA40D42009A08D650068C0D5 /* ScreenSelectMaster.cpp in Sources */, @@ -6518,7 +6515,6 @@ AAD8F9350A4B97DF000311CF /* ScreenGameplayShared.cpp in Sources */, AAAA11C90A662F9D00B2BD88 /* ScoreKeeperShared.cpp in Sources */, AAE2D6D50A67481E00071546 /* ScoreKeeper.cpp in Sources */, - AA8122E40A7499F5002E1D1A /* RageDisplay_OGL_Helpers.cpp in Sources */, AA2EA0030A770208003A0C11 /* ScreenSelectLanguage.cpp in Sources */, AA5D16590A79805C00F17E86 /* RageTextureRenderTarget.cpp in Sources */, AA5D166E0A798C0E00F17E86 /* ActorFrameTexture.cpp in Sources */, diff --git a/src/RageDisplay_Legacy.cpp b/src/RageDisplay_Legacy.cpp index 5a403a04a7..207e52ecb7 100644 --- a/src/RageDisplay_Legacy.cpp +++ b/src/RageDisplay_Legacy.cpp @@ -1,8 +1,8 @@ #include "global.h" -#include "RageDisplay_OGL.h" -#include "RageDisplay_OGL_Helpers.h" -using namespace RageDisplay_OGL_Helpers; +#include "RageDisplay_Legacy.h" +#include "RageDisplay_Legacy_Helpers.h" +using namespace RageDisplay_Legacy_Helpers; #include "RageFile.h" #include "RageSurface.h" @@ -249,13 +249,13 @@ static void TurnOffHardwareVBO() } } -RageDisplay_OGL::RageDisplay_OGL() +RageDisplay_Legacy::RageDisplay_Legacy() { - LOG->Trace( "RageDisplay_OGL::RageDisplay_OGL()" ); + LOG->Trace( "RageDisplay_Legacy::RageDisplay_Legacy()" ); LOG->MapLog("renderer", "Current renderer: OpenGL"); FixLittleEndian(); - RageDisplay_OGL_Helpers::Init(); + RageDisplay_Legacy_Helpers::Init(); g_pWind = NULL; g_bTextureMatrixShader = 0; @@ -442,9 +442,9 @@ void InitShaders() } } -static LocalizedString OBTAIN_AN_UPDATED_VIDEO_DRIVER ( "RageDisplay_OGL", "Obtain an updated driver from your video card manufacturer." ); -static LocalizedString GLDIRECT_IS_NOT_COMPATIBLE ( "RageDisplay_OGL", "GLDirect was detected. GLDirect is not compatible with this game and should be disabled." ); -RString RageDisplay_OGL::Init( const VideoModeParams &p, bool bAllowUnacceleratedRenderer ) +static LocalizedString OBTAIN_AN_UPDATED_VIDEO_DRIVER ( "RageDisplay_Legacy", "Obtain an updated driver from your video card manufacturer." ); +static LocalizedString GLDIRECT_IS_NOT_COMPATIBLE ( "RageDisplay_Legacy", "GLDirect was detected. GLDirect is not compatible with this game and should be disabled." ); +RString RageDisplay_Legacy::Init( const VideoModeParams &p, bool bAllowUnacceleratedRenderer ) { g_pWind = LowLevelWindow::Create(); @@ -537,12 +537,12 @@ RString RageDisplay_OGL::Init( const VideoModeParams &p, bool bAllowUnaccelerate return RString(); } -RageDisplay_OGL::~RageDisplay_OGL() +RageDisplay_Legacy::~RageDisplay_Legacy() { delete g_pWind; } -void RageDisplay_OGL::GetDisplayResolutions( DisplayResolutions &out ) const +void RageDisplay_Legacy::GetDisplayResolutions( DisplayResolutions &out ) const { out.clear(); g_pWind->GetDisplayResolutions( out ); @@ -705,9 +705,9 @@ void SetupExtensions() } } -void RageDisplay_OGL::ResolutionChanged() +void RageDisplay_Legacy::ResolutionChanged() { - //LOG->Warn( "RageDisplay_OGL::ResolutionChanged" ); + //LOG->Warn( "RageDisplay_Legacy::ResolutionChanged" ); /* Clear any junk that's in the framebuffer. */ if( BeginFrame() ) @@ -719,9 +719,9 @@ void RageDisplay_OGL::ResolutionChanged() // Return true if mode change was successful. // bNewDeviceOut is set true if a new device was created and textures // need to be reloaded. -RString RageDisplay_OGL::TryVideoMode( const VideoModeParams &p, bool &bNewDeviceOut ) +RString RageDisplay_Legacy::TryVideoMode( const VideoModeParams &p, bool &bNewDeviceOut ) { - //LOG->Warn( "RageDisplay_OGL::TryVideoMode( %d, %d, %d, %d, %d, %d )", p.windowed, p.width, p.height, p.bpp, p.rate, p.vsync ); + //LOG->Warn( "RageDisplay_Legacy::TryVideoMode( %d, %d, %d, %d, %d, %d )", p.windowed, p.width, p.height, p.bpp, p.rate, p.vsync ); RString err; err = g_pWind->TryVideoMode( p, bNewDeviceOut ); @@ -761,14 +761,14 @@ RString RageDisplay_OGL::TryVideoMode( const VideoModeParams &p, bool &bNewDevic return RString(); // successfully set mode } -int RageDisplay_OGL::GetMaxTextureSize() const +int RageDisplay_Legacy::GetMaxTextureSize() const { GLint size; glGetIntegerv( GL_MAX_TEXTURE_SIZE, &size ); return size; } -bool RageDisplay_OGL::BeginFrame() +bool RageDisplay_Legacy::BeginFrame() { /* We do this in here, rather than ResolutionChanged, or we won't update the * viewport for the concurrent rendering context. */ @@ -784,7 +784,7 @@ bool RageDisplay_OGL::BeginFrame() return RageDisplay::BeginFrame(); } -void RageDisplay_OGL::EndFrame() +void RageDisplay_Legacy::EndFrame() { glFlush(); @@ -797,7 +797,7 @@ void RageDisplay_OGL::EndFrame() RageDisplay::EndFrame(); } -RageSurface* RageDisplay_OGL::CreateScreenshot() +RageSurface* RageDisplay_Legacy::CreateScreenshot() { int width = g_pWind->GetActualVideoModeParams().width; int height = g_pWind->GetActualVideoModeParams().height; @@ -820,7 +820,7 @@ RageSurface* RageDisplay_OGL::CreateScreenshot() return image; } -RageSurface *RageDisplay_OGL::GetTexture( unsigned iTexture ) +RageSurface *RageDisplay_Legacy::GetTexture( unsigned iTexture ) { if( iTexture == 0 ) return NULL; // XXX @@ -844,7 +844,7 @@ RageSurface *RageDisplay_OGL::GetTexture( unsigned iTexture ) return pImage; } -VideoModeParams RageDisplay_OGL::GetActualVideoModeParams() const +VideoModeParams RageDisplay_Legacy::GetActualVideoModeParams() const { return g_pWind->GetActualVideoModeParams(); } @@ -903,7 +903,7 @@ static void SetupVertices( const RageSpriteVertex v[], int iNumVerts ) glNormalPointer( GL_FLOAT, 0, Normal ); } -void RageDisplay_OGL::SendCurrentMatrices() +void RageDisplay_Legacy::SendCurrentMatrices() { RageMatrix projection; RageMatrixMultiply( &projection, GetCentering(), GetProjectionTop() ); @@ -1364,7 +1364,7 @@ void RageCompiledGeometryHWOGL::Draw( int iMeshIndex ) const } } -RageCompiledGeometry* RageDisplay_OGL::CreateCompiledGeometry() +RageCompiledGeometry* RageDisplay_Legacy::CreateCompiledGeometry() { if( GLExt.glGenBuffersARB ) return new RageCompiledGeometryHWOGL; @@ -1372,12 +1372,12 @@ RageCompiledGeometry* RageDisplay_OGL::CreateCompiledGeometry() return new RageCompiledGeometrySWOGL; } -void RageDisplay_OGL::DeleteCompiledGeometry( RageCompiledGeometry* p ) +void RageDisplay_Legacy::DeleteCompiledGeometry( RageCompiledGeometry* p ) { delete p; } -void RageDisplay_OGL::DrawQuadsInternal( const RageSpriteVertex v[], int iNumVerts ) +void RageDisplay_Legacy::DrawQuadsInternal( const RageSpriteVertex v[], int iNumVerts ) { TurnOffHardwareVBO(); SendCurrentMatrices(); @@ -1386,7 +1386,7 @@ void RageDisplay_OGL::DrawQuadsInternal( const RageSpriteVertex v[], int iNumVer glDrawArrays( GL_QUADS, 0, iNumVerts ); } -void RageDisplay_OGL::DrawQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) +void RageDisplay_Legacy::DrawQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) { TurnOffHardwareVBO(); SendCurrentMatrices(); @@ -1395,7 +1395,7 @@ void RageDisplay_OGL::DrawQuadStripInternal( const RageSpriteVertex v[], int iNu glDrawArrays( GL_QUAD_STRIP, 0, iNumVerts ); } -void RageDisplay_OGL::DrawSymmetricQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) +void RageDisplay_Legacy::DrawSymmetricQuadStripInternal( const RageSpriteVertex v[], int iNumVerts ) { int iNumPieces = (iNumVerts-3)/3; int iNumTriangles = iNumPieces*4; @@ -1434,7 +1434,7 @@ void RageDisplay_OGL::DrawSymmetricQuadStripInternal( const RageSpriteVertex v[] &vIndices[0] ); } -void RageDisplay_OGL::DrawFanInternal( const RageSpriteVertex v[], int iNumVerts ) +void RageDisplay_Legacy::DrawFanInternal( const RageSpriteVertex v[], int iNumVerts ) { TurnOffHardwareVBO(); SendCurrentMatrices(); @@ -1443,7 +1443,7 @@ void RageDisplay_OGL::DrawFanInternal( const RageSpriteVertex v[], int iNumVerts glDrawArrays( GL_TRIANGLE_FAN, 0, iNumVerts ); } -void RageDisplay_OGL::DrawStripInternal( const RageSpriteVertex v[], int iNumVerts ) +void RageDisplay_Legacy::DrawStripInternal( const RageSpriteVertex v[], int iNumVerts ) { TurnOffHardwareVBO(); SendCurrentMatrices(); @@ -1452,7 +1452,7 @@ void RageDisplay_OGL::DrawStripInternal( const RageSpriteVertex v[], int iNumVer glDrawArrays( GL_TRIANGLE_STRIP, 0, iNumVerts ); } -void RageDisplay_OGL::DrawTrianglesInternal( const RageSpriteVertex v[], int iNumVerts ) +void RageDisplay_Legacy::DrawTrianglesInternal( const RageSpriteVertex v[], int iNumVerts ) { TurnOffHardwareVBO(); SendCurrentMatrices(); @@ -1461,7 +1461,7 @@ void RageDisplay_OGL::DrawTrianglesInternal( const RageSpriteVertex v[], int iNu glDrawArrays( GL_TRIANGLES, 0, iNumVerts ); } -void RageDisplay_OGL::DrawCompiledGeometryInternal( const RageCompiledGeometry *p, int iMeshIndex ) +void RageDisplay_Legacy::DrawCompiledGeometryInternal( const RageCompiledGeometry *p, int iMeshIndex ) { TurnOffHardwareVBO(); SendCurrentMatrices(); @@ -1469,7 +1469,7 @@ void RageDisplay_OGL::DrawCompiledGeometryInternal( const RageCompiledGeometry * p->Draw( iMeshIndex ); } -void RageDisplay_OGL::DrawLineStripInternal( const RageSpriteVertex v[], int iNumVerts, float fLineWidth ) +void RageDisplay_Legacy::DrawLineStripInternal( const RageSpriteVertex v[], int iNumVerts, float fLineWidth ) { TurnOffHardwareVBO(); @@ -1555,7 +1555,7 @@ static bool SetTextureUnit( TextureUnit tu ) return true; } -void RageDisplay_OGL::ClearAllTextures() +void RageDisplay_Legacy::ClearAllTextures() { FOREACH_ENUM( TextureUnit, i ) SetTexture( i, 0 ); @@ -1566,7 +1566,7 @@ void RageDisplay_OGL::ClearAllTextures() GLExt.glActiveTextureARB(GL_TEXTURE0_ARB); } -int RageDisplay_OGL::GetNumTextureUnits() +int RageDisplay_Legacy::GetNumTextureUnits() { if( GLExt.glActiveTextureARB == NULL ) return 1; @@ -1574,7 +1574,7 @@ int RageDisplay_OGL::GetNumTextureUnits() return g_iMaxTextureUnits; } -void RageDisplay_OGL::SetTexture( TextureUnit tu, unsigned iTexture ) +void RageDisplay_Legacy::SetTexture( TextureUnit tu, unsigned iTexture ) { if( !SetTextureUnit( tu ) ) return; @@ -1590,7 +1590,7 @@ void RageDisplay_OGL::SetTexture( TextureUnit tu, unsigned iTexture ) } } -void RageDisplay_OGL::SetTextureMode( TextureUnit tu, TextureMode tm ) +void RageDisplay_Legacy::SetTextureMode( TextureUnit tu, TextureMode tm ) { if( !SetTextureUnit( tu ) ) return; @@ -1629,7 +1629,7 @@ void RageDisplay_OGL::SetTextureMode( TextureUnit tu, TextureMode tm ) } } -void RageDisplay_OGL::SetTextureFiltering( TextureUnit tu, bool b ) +void RageDisplay_Legacy::SetTextureFiltering( TextureUnit tu, bool b ) { glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, b? GL_LINEAR: GL_NEAREST ); @@ -1661,7 +1661,7 @@ void RageDisplay_OGL::SetTextureFiltering( TextureUnit tu, bool b ) glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, iMinFilter ); } -void RageDisplay_OGL::SetEffectMode( EffectMode effect ) +void RageDisplay_Legacy::SetEffectMode( EffectMode effect ) { if( GLExt.glUseProgramObjectARB == NULL ) return; @@ -1700,7 +1700,7 @@ void RageDisplay_OGL::SetEffectMode( EffectMode effect ) DebugAssertNoGLError(); } -bool RageDisplay_OGL::IsEffectModeSupported( EffectMode effect ) +bool RageDisplay_Legacy::IsEffectModeSupported( EffectMode effect ) { switch( effect ) { @@ -1718,7 +1718,7 @@ bool RageDisplay_OGL::IsEffectModeSupported( EffectMode effect ) return false; } -void RageDisplay_OGL::SetBlendMode( BlendMode mode ) +void RageDisplay_Legacy::SetBlendMode( BlendMode mode ) { glEnable(GL_BLEND); @@ -1785,21 +1785,21 @@ void RageDisplay_OGL::SetBlendMode( BlendMode mode ) glBlendFunc( iSourceRGB, iDestRGB ); } -bool RageDisplay_OGL::IsZWriteEnabled() const +bool RageDisplay_Legacy::IsZWriteEnabled() const { bool a; glGetBooleanv( GL_DEPTH_WRITEMASK, (unsigned char*)&a ); return a; } -bool RageDisplay_OGL::IsZTestEnabled() const +bool RageDisplay_Legacy::IsZTestEnabled() const { GLenum a; glGetIntegerv( GL_DEPTH_FUNC, (GLint*)&a ); return a != GL_ALWAYS; } -void RageDisplay_OGL::ClearZBuffer() +void RageDisplay_Legacy::ClearZBuffer() { bool write = IsZWriteEnabled(); SetZWrite( true ); @@ -1807,12 +1807,12 @@ void RageDisplay_OGL::ClearZBuffer() SetZWrite( write ); } -void RageDisplay_OGL::SetZWrite( bool b ) +void RageDisplay_Legacy::SetZWrite( bool b ) { glDepthMask( b ); } -void RageDisplay_OGL::SetZBias( float f ) +void RageDisplay_Legacy::SetZBias( float f ) { float fNear = SCALE( f, 0.0f, 1.0f, 0.05f, 0.0f ); float fFar = SCALE( f, 0.0f, 1.0f, 1.0f, 0.95f ); @@ -1820,7 +1820,7 @@ void RageDisplay_OGL::SetZBias( float f ) glDepthRange( fNear, fFar ); } -void RageDisplay_OGL::SetZTestMode( ZTestMode mode ) +void RageDisplay_Legacy::SetZTestMode( ZTestMode mode ) { glEnable( GL_DEPTH_TEST ); switch( mode ) @@ -1832,7 +1832,7 @@ void RageDisplay_OGL::SetZTestMode( ZTestMode mode ) } } -void RageDisplay_OGL::SetTextureWrapping( TextureUnit tu, bool b ) +void RageDisplay_Legacy::SetTextureWrapping( TextureUnit tu, bool b ) { /* This should be per-texture-unit state, but it's per-texture state in OpenGl, * so we'll behave incorrectly if the same texture is used in more than one texture @@ -1844,7 +1844,7 @@ void RageDisplay_OGL::SetTextureWrapping( TextureUnit tu, bool b ) glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, mode ); } -void RageDisplay_OGL::SetMaterial( +void RageDisplay_Legacy::SetMaterial( const RageColor &emissive, const RageColor &ambient, const RageColor &diffuse, @@ -1878,18 +1878,18 @@ void RageDisplay_OGL::SetMaterial( } } -void RageDisplay_OGL::SetLighting( bool b ) +void RageDisplay_Legacy::SetLighting( bool b ) { if( b ) glEnable( GL_LIGHTING ); else glDisable( GL_LIGHTING ); } -void RageDisplay_OGL::SetLightOff( int index ) +void RageDisplay_Legacy::SetLightOff( int index ) { glDisable( GL_LIGHT0+index ); } -void RageDisplay_OGL::SetLightDirectional( +void RageDisplay_Legacy::SetLightDirectional( int index, const RageColor &ambient, const RageColor &diffuse, @@ -1911,7 +1911,7 @@ void RageDisplay_OGL::SetLightDirectional( glPopMatrix(); } -void RageDisplay_OGL::SetCullMode( CullMode mode ) +void RageDisplay_Legacy::SetCullMode( CullMode mode ) { if (mode != CULL_NONE) glEnable(GL_CULL_FACE); @@ -1931,39 +1931,39 @@ void RageDisplay_OGL::SetCullMode( CullMode mode ) } } -const RageDisplay::PixelFormatDesc *RageDisplay_OGL::GetPixelFormatDesc(PixelFormat pf) const +const RageDisplay::PixelFormatDesc *RageDisplay_Legacy::GetPixelFormatDesc(PixelFormat pf) const { ASSERT( pf < NUM_PixelFormat ); return &PIXEL_FORMAT_DESC[pf]; } -bool RageDisplay_OGL::SupportsThreadedRendering() +bool RageDisplay_Legacy::SupportsThreadedRendering() { return g_pWind->SupportsThreadedRendering(); } -void RageDisplay_OGL::BeginConcurrentRenderingMainThread() +void RageDisplay_Legacy::BeginConcurrentRenderingMainThread() { g_pWind->BeginConcurrentRenderingMainThread(); } -void RageDisplay_OGL::EndConcurrentRenderingMainThread() +void RageDisplay_Legacy::EndConcurrentRenderingMainThread() { g_pWind->EndConcurrentRenderingMainThread(); } -void RageDisplay_OGL::BeginConcurrentRendering() +void RageDisplay_Legacy::BeginConcurrentRendering() { g_pWind->BeginConcurrentRendering(); RageDisplay::BeginConcurrentRendering(); } -void RageDisplay_OGL::EndConcurrentRendering() +void RageDisplay_Legacy::EndConcurrentRendering() { g_pWind->EndConcurrentRendering(); } -void RageDisplay_OGL::DeleteTexture( unsigned iTexture ) +void RageDisplay_Legacy::DeleteTexture( unsigned iTexture ) { if( iTexture == 0 ) return; @@ -1981,7 +1981,7 @@ void RageDisplay_OGL::DeleteTexture( unsigned iTexture ) } -PixelFormat RageDisplay_OGL::GetImgPixelFormat( RageSurface* &img, bool &bFreeImg, int width, int height, bool bPalettedTexture ) +PixelFormat RageDisplay_Legacy::GetImgPixelFormat( RageSurface* &img, bool &bFreeImg, int width, int height, bool bPalettedTexture ) { PixelFormat pixfmt = FindPixelFormat( img->format->BitsPerPixel, img->format->Rmask, img->format->Gmask, img->format->Bmask, img->format->Amask ); @@ -2048,7 +2048,7 @@ void SetPixelMapForSurface( int glImageFormat, int glTexFormat, const RageSurfac DebugAssertNoGLError(); } -unsigned RageDisplay_OGL::CreateTexture( +unsigned RageDisplay_Legacy::CreateTexture( PixelFormat pixfmt, RageSurface* pImg, bool bGenerateMipMaps ) @@ -2258,7 +2258,7 @@ private: unsigned m_iTexHandle; }; -RageTextureLock *RageDisplay_OGL::CreateTextureLock() +RageTextureLock *RageDisplay_Legacy::CreateTextureLock() { if( !GLExt.HasExtension("GL_ARB_pixel_buffer_object") ) return NULL; @@ -2266,7 +2266,7 @@ RageTextureLock *RageDisplay_OGL::CreateTextureLock() return new RageTextureLock_OGL; } -void RageDisplay_OGL::UpdateTexture( +void RageDisplay_Legacy::UpdateTexture( unsigned iTexHandle, RageSurface* pImg, int iXOffset, int iYOffset, int iWidth, int iHeight ) @@ -2421,7 +2421,7 @@ void RenderTarget_FramebufferObject::FinishRenderingTo() GLExt.glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); } -bool RageDisplay_OGL::SupportsRenderToTexture() const +bool RageDisplay_Legacy::SupportsRenderToTexture() const { return GLExt.m_bGL_EXT_framebuffer_object || g_pWind->SupportsRenderToTexture(); } @@ -2432,7 +2432,7 @@ bool RageDisplay_OGL::SupportsRenderToTexture() const * particularly GeForce 2, but is simpler and faster when available. */ -unsigned RageDisplay_OGL::CreateRenderTarget( const RenderTargetParam ¶m, int &iTextureWidthOut, int &iTextureHeightOut ) +unsigned RageDisplay_Legacy::CreateRenderTarget( const RenderTargetParam ¶m, int &iTextureWidthOut, int &iTextureHeightOut ) { RenderTarget *pTarget; if( GLExt.m_bGL_EXT_framebuffer_object ) @@ -2449,7 +2449,7 @@ unsigned RageDisplay_OGL::CreateRenderTarget( const RenderTargetParam ¶m, in return iTexture; } -void RageDisplay_OGL::SetRenderTarget( unsigned iTexture, bool bPreserveTexture ) +void RageDisplay_Legacy::SetRenderTarget( unsigned iTexture, bool bPreserveTexture ) { if( iTexture == 0 ) { @@ -2510,7 +2510,7 @@ void RageDisplay_OGL::SetRenderTarget( unsigned iTexture, bool bPreserveTexture } } -void RageDisplay_OGL::SetPolygonMode( PolygonMode pm ) +void RageDisplay_Legacy::SetPolygonMode( PolygonMode pm ) { GLenum m; switch( pm ) @@ -2522,12 +2522,12 @@ void RageDisplay_OGL::SetPolygonMode( PolygonMode pm ) glPolygonMode( GL_FRONT_AND_BACK, m ); } -void RageDisplay_OGL::SetLineWidth( float fWidth ) +void RageDisplay_Legacy::SetLineWidth( float fWidth ) { glLineWidth( fWidth ); } -RString RageDisplay_OGL::GetTextureDiagnostics( unsigned iTexture ) const +RString RageDisplay_Legacy::GetTextureDiagnostics( unsigned iTexture ) const { /* s << (bGenerateMipMaps? "gluBuild2DMipmaps":"glTexImage2D"); @@ -2560,7 +2560,7 @@ RString RageDisplay_OGL::GetTextureDiagnostics( unsigned iTexture ) const return RString(); } -void RageDisplay_OGL::SetAlphaTest( bool b ) +void RageDisplay_Legacy::SetAlphaTest( bool b ) { glAlphaFunc( GL_GREATER, 0.01f ); if( b ) @@ -2584,7 +2584,7 @@ void RageDisplay_OGL::SetAlphaTest( bool b ) * Another case of this is incomplete packed pixels support. Some implementations * neglect GL_UNSIGNED_SHORT_*_REV. */ -bool RageDisplay_OGL::SupportsSurfaceFormat( PixelFormat pixfmt ) +bool RageDisplay_Legacy::SupportsSurfaceFormat( PixelFormat pixfmt ) { switch( g_GLPixFmtInfo[pixfmt].type ) { @@ -2596,7 +2596,7 @@ bool RageDisplay_OGL::SupportsSurfaceFormat( PixelFormat pixfmt ) } -bool RageDisplay_OGL::SupportsTextureFormat( PixelFormat pixfmt, bool bRealtime ) +bool RageDisplay_Legacy::SupportsTextureFormat( PixelFormat pixfmt, bool bRealtime ) { /* If we support a pixfmt for texture formats but not for surface formats, then * we'll have to convert the texture to a supported surface format before uploading. @@ -2616,14 +2616,14 @@ bool RageDisplay_OGL::SupportsTextureFormat( PixelFormat pixfmt, bool bRealtime } } -bool RageDisplay_OGL::SupportsPerVertexMatrixScale() +bool RageDisplay_Legacy::SupportsPerVertexMatrixScale() { // Intel i915 on OSX 10.4.4 supports vertex programs but not hardware vertex buffers. // Our software vertex rendering doesn't support vertex programs. return GLExt.glGenBuffersARB && g_bTextureMatrixShader != 0; } -void RageDisplay_OGL::SetSphereEnvironmentMapping( TextureUnit tu, bool b ) +void RageDisplay_Legacy::SetSphereEnvironmentMapping( TextureUnit tu, bool b ) { if( !SetTextureUnit( tu ) ) return; @@ -2644,7 +2644,7 @@ void RageDisplay_OGL::SetSphereEnvironmentMapping( TextureUnit tu, bool b ) GLint iCelTexture1, iCelTexture2 = NULL; -void RageDisplay_OGL::SetCelShaded( int stage ) +void RageDisplay_Legacy::SetCelShaded( int stage ) { if( !GLExt.m_bGL_ARB_fragment_shader ) return; // not supported diff --git a/src/RageDisplay_Legacy.h b/src/RageDisplay_Legacy.h index 1a4556d643..7b3366aee5 100644 --- a/src/RageDisplay_Legacy.h +++ b/src/RageDisplay_Legacy.h @@ -1,4 +1,4 @@ -/* RageDisplay_OGL: OpenGL renderer. */ +/* RageDisplay_Legacy: OpenGL renderer. */ #ifndef RAGE_DISPLAY_OGL_H #define RAGE_DISPLAY_OGL_H @@ -12,7 +12,7 @@ #define AssertNoGLError() \ { \ GLenum error = glGetError(); \ - ASSERT_M( error == GL_NO_ERROR, RageDisplay_OGL_Helpers::GLToString(error) ); \ + ASSERT_M( error == GL_NO_ERROR, RageDisplay_Legacy_Helpers::GLToString(error) ); \ } #if defined(DEBUG) || !defined(GL_GET_ERROR_IS_SLOW) @@ -23,11 +23,11 @@ #define DebugAssertNoGLError() #endif -class RageDisplay_OGL: public RageDisplay +class RageDisplay_Legacy: public RageDisplay { public: - RageDisplay_OGL(); - virtual ~RageDisplay_OGL(); + RageDisplay_Legacy(); + virtual ~RageDisplay_Legacy(); virtual RString Init( const VideoModeParams &p, bool bAllowUnacceleratedRenderer ); virtual RString GetApiDescription() const { return "OpenGL"; } diff --git a/src/RageDisplay_Legacy_Helpers.cpp b/src/RageDisplay_Legacy_Helpers.cpp index 7fbf04f8cd..56433e14d7 100644 --- a/src/RageDisplay_Legacy_Helpers.cpp +++ b/src/RageDisplay_Legacy_Helpers.cpp @@ -1,5 +1,5 @@ #include "global.h" -#include "RageDisplay_OGL_Helpers.h" +#include "RageDisplay_Legacy_Helpers.h" #include "RageUtil.h" #include "RageLog.h" @@ -31,12 +31,12 @@ namespace } }; -void RageDisplay_OGL_Helpers::Init() +void RageDisplay_Legacy_Helpers::Init() { InitStringMap(); } -RString RageDisplay_OGL_Helpers::GLToString( GLenum e ) +RString RageDisplay_Legacy_Helpers::GLToString( GLenum e ) { if( g_Strings.find(e) != g_Strings.end() ) return g_Strings[e]; diff --git a/src/RageDisplay_Legacy_Helpers.h b/src/RageDisplay_Legacy_Helpers.h index 3a59abe38e..f41ba4cda1 100644 --- a/src/RageDisplay_Legacy_Helpers.h +++ b/src/RageDisplay_Legacy_Helpers.h @@ -19,7 +19,7 @@ #undef __glext_h_ #include "glext.h" -/* Import RageDisplay, for types. Do not include RageDisplay_OGL.h. */ +/* Import RageDisplay, for types. Do not include RageDisplay_Legacy.h. */ #include "RageDisplay.h" /* Windows defines GL_EXT_paletted_texture incompletely: */ @@ -31,7 +31,7 @@ typedef bool (APIENTRY * PWSWAPINTERVALEXTPROC) (int interval); /** @brief Utilities for working with the RageDisplay. */ -namespace RageDisplay_OGL_Helpers +namespace RageDisplay_Legacy_Helpers { void Init(); RString GLToString( GLenum e ); diff --git a/src/StepMania.cpp b/src/StepMania.cpp index 8b5830d7cb..798483e621 100644 --- a/src/StepMania.cpp +++ b/src/StepMania.cpp @@ -421,12 +421,12 @@ static void AdjustForChangedSystemCapabilities() } #if defined(WIN32) -#include "RageDisplay_D3D.h" +//#include "RageDisplay_D3D.h" #include "archutils/Win32/VideoDriverInfo.h" #endif #if defined(SUPPORT_OPENGL) -#include "RageDisplay_OGL.h" +#include "RageDisplay_Legacy.h" #endif #include "RageDisplay_Null.h" @@ -469,6 +469,7 @@ struct VideoCardDefaults } } const g_VideoCardDefaults[] = { +/* VideoCardDefaults( "Xbox", "d3d", @@ -477,9 +478,10 @@ struct VideoCardDefaults 2048, true ), +*/ VideoCardDefaults( "Voodoo *5", - "d3d,opengl", // received 3 reports of opengl crashing. -Chris + "opengl", // received 3 reports of opengl crashing. -Chris 640,480, 32,32,32, 2048, @@ -487,7 +489,7 @@ struct VideoCardDefaults ), VideoCardDefaults( "Voodoo|3dfx", // all other Voodoos: some drivers don't identify which one - "d3d,opengl", + "opengl", 640,480, 16,16,16, 256, @@ -495,7 +497,7 @@ struct VideoCardDefaults ), VideoCardDefaults( "Radeon.* 7|Wonder 7500|ArcadeVGA", // Radeon 7xxx, RADEON Mobility 7500 - "d3d,opengl", // movie texture performance is terrible in OpenGL, but fine in D3D. + "opengl", // movie texture performance is terrible in OpenGL, but fine in D3D. 640,480, 16,16,16, 2048, @@ -503,7 +505,7 @@ struct VideoCardDefaults ), VideoCardDefaults( "GeForce|Radeon|Wonder 9|Quadro", - "opengl,d3d", + "opengl", 640,480, 32,32,32, // 32 bit textures are faster to load 2048, @@ -511,7 +513,7 @@ struct VideoCardDefaults ), VideoCardDefaults( "TNT|Vanta|M64", - "opengl,d3d", + "opengl", 640,480, 16,16,16, // Athlon 1.2+TNT demonstration w/ movies: 70fps w/ 32bit textures, 86fps w/ 16bit textures 2048, @@ -519,12 +521,13 @@ struct VideoCardDefaults ), VideoCardDefaults( "G200|G250|G400", - "d3d,opengl", + "opengl", 640,480, 16,16,16, 2048, false // broken, causes black screen ), +/* VideoCardDefaults( "Savage", "d3d", @@ -548,9 +551,10 @@ struct VideoCardDefaults 256, false ), +*/ VideoCardDefaults( "RAGE MOBILITY-M1", - "d3d,opengl", // Vertex alpha is broken in OpenGL, but not D3D. -Chris + "opengl", // Vertex alpha is broken in OpenGL, but not D3D. -Chris 400,300, // lower resolution for 60fps 16,16,16, 256, @@ -558,7 +562,7 @@ struct VideoCardDefaults ), VideoCardDefaults( "Mobility M3", // ATI Rage Mobility 128 (AKA "M3") - "d3d,opengl", // bad movie texture performance in opengl + "opengl", // bad movie texture performance in opengl 640,480, 16,16,16, 1024, @@ -566,7 +570,7 @@ struct VideoCardDefaults ), VideoCardDefaults( "Intel.*82810|Intel.*82815", - "opengl,d3d",// OpenGL is 50%+ faster than D3D w/ latest Intel drivers. -Chris + "opengl",// OpenGL is 50%+ faster than D3D w/ latest Intel drivers. -Chris 512,384, // lower resolution for 60fps 16,16,16, 512, @@ -574,15 +578,15 @@ struct VideoCardDefaults ), VideoCardDefaults( "Intel*Extreme Graphics", - "d3d", // OpenGL blue screens w/ XP drivers from 6-21-2002 + "opengl", // OpenGL blue screens w/ XP drivers from 6-21-2002 640,480, 16,16,16, // slow at 32bpp 1024, false ), VideoCardDefaults( - "Intel.*", /* fallback: all unknown Intel cards to D3D, since Intel is notoriously bad at OpenGL */ - "d3d,opengl", + "Intel.*", /* fallback: all unknown Intel cards to since Intel is notoriously bad at OpenGL */ + "opengl", 640,480, 16,16,16, 2048, @@ -595,17 +599,17 @@ struct VideoCardDefaults // bug 764830: ASSERT fail after glDeleteTextures for "VIA Tech VT8361/VT8601 Graphics Controller" // bug 791950: AV in glsis630!DrvSwapBuffers for "SiS 630/730" "Trident Video Accelerator CyberBlade|VIA.*VT|SiS 6*", - "d3d,opengl", + "opengl", 640,480, 16,16,16, 2048, false ), VideoCardDefaults( - /* Unconfirmed texture problems on this; let's try D3D, since it's + /* Unconfirmed texture problems on this; let's try since it's * a VIA/S3 chipset. */ "VIA/S3G KM400/KN400", - "d3d,opengl", + "opengl", 640,480, 16,16,16, 2048, @@ -623,7 +627,7 @@ struct VideoCardDefaults // Default graphics settings used for all cards that don't match above. // This must be the very last entry! "", - "opengl,d3d", + "opengl", 640,480, 32,32,32, 2048, @@ -762,7 +766,7 @@ RageDisplay *CreateDisplay() if( sRenderer.CompareNoCase("opengl")==0 ) { #if defined(SUPPORT_OPENGL) - pRet = new RageDisplay_OGL; + pRet = new RageDisplay_Legacy; #endif } else if( sRenderer.CompareNoCase("d3d")==0 )