The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-15 06:58:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,798 Commits 10 Branches 16 Tags
adab4e37f7dcfe9a60819a2ed1f8576b8a57a505
Commit Graph

294 Commits

Author SHA1 Message Date
lioncash
d244bca1f5 Fix a bunch of random typos in comments and logging. 
Also update the comment headers for two functions in GCMemcard.cpp.
 2013-04-19 09:21:45 -04:00
Lioncash
e78d99e5c1 New license header introduced to all Video based projects. 2013-04-17 23:29:41 -04:00
Ryan Houdek
7772f0d071 Merge branch 'Android-trash' since it is no longer quite so trashy. 2013-04-14 23:36:00 -05:00
Ryan Houdek
37b67971e7 Merge remote-tracking branch 'origin/master' into Android-trash 
Conflicts:
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
 2013-04-14 20:43:42 -05:00
Ryan Houdek
bde7ea00ef Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp 2013-04-14 20:39:56 -05:00
Lioncash
7ab0cca645 Clean up most (99.99%) of the tab/space mismatches in the VideoSoftware project. 
Got rid of trailing spaces that were unnecessary too.

Also update the license header for this project. We don't use SVN anymore.
 2013-04-13 23:54:02 -04:00
Ryan Houdek
605bbf5ca8 Merge remote-tracking branch 'origin/master' into Android-trash 2013-04-13 00:58:37 -05:00
Ryan Houdek
39a7096711 Extend our OSD class to support callbacks on init, onframe, and shutdown. 2013-04-13 00:48:53 -05:00
Jordan Woyak
385d8e2b15 ChunkFile has allowed me to accidentally "Do" a non-POD for the last time! 2013-04-09 19:02:22 -05:00
Lioncash
195336021f Fix a few typos in the comments/logging in VideoDX9, VideoCommon, and VideoSoftware projects. 
See Render.cpp, PixelShaderGen.cpp, and PixelShaderManager.cpp for most of the changes.

See VertexShaderManager.cpp for a logging typo fix.

See SWRenderer.cpp for a small typo fix for a message that gets swprintf'd in DrawDebugText.

See SWVertexLoader.cpp for a typo fix of an assert message.

Should slightly improve the readability of some of those files.
 2013-04-07 17:11:29 -04:00
NeoBrainX
5f32febcf3 Apply re07a91930df0 to the software renderer. 2013-04-07 16:54:22 +02:00
lioncash
a7c05dc922 Remove an unused variable in VideoConfig.cpp and SWVideoConfig.cpp 2013-04-04 09:32:28 -04:00
Ryan Houdek
1dd1ebb8bd Fix ARM building. 2013-04-03 05:20:41 +00:00
NeoBrainX
fb28349056 VideoSoftware: Fail less at clamping. 2013-03-28 23:34:14 +01:00
NeoBrainX
0994a5828d VideoSoftware: Improve fog range adjustment by using less magic and more comments. 2013-03-26 00:57:45 +01:00
degasus
3ab4e35582 revert RasterFont for VideoSoftware 
Backends shouldn't depend on each other. Here RasterFont depends on ProgramShaderCache, which itself depends on global config again ...
 2013-03-26 00:05:46 +01:00
NeoBrainX
beb083721a Windows build fix from web interface... 2013-03-25 21:43:32 +00:00
NeoBrainX
ae146e8bc7 VideoSoftware: Implement fog range adjustment, fixing issue 6147. 2013-03-25 21:13:31 +01:00
Ryan Houdek
7034c79ab9 Big commit. Fix running the APK, I had missed a view in the manifest. Clean up the Android EGL context creation to fit more in line with how Dolphin works. This breaks input at the moment as well. Change the memarena from 768MB to 64MB to allow 1GB phones to potentially run it. Rename EGL_X11 back to EGL since this merge brings in some of soreau's changes to more easily allow different platforms like Wayland and Android. Not quite all of the code because some needs to be cleaned up still. 2013-03-24 21:06:34 -05:00
Ryan Houdek
d11679a06e Android mega commit of trash. 2013-03-19 21:53:09 -05:00
Ryan Houdek
12f5f102c7 Set GLES Tex2D function to texture2D, texture is only available in GLES3. Fix some tabs in the config file. 2013-03-18 07:50:52 +00:00
degasus
7597b8b8d5 fix software backend 
ogl rasterfont sets vao and vbo, but both aren't used on software backend
 2013-03-17 12:37:37 +01:00
Ryan Houdek
8c1091a21f Merge branch 'master' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
 2013-03-15 11:19:52 -05:00
NeoBrainX
1f73651a7a VideoSoftware: Do not clear the depth buffer on EFB copy clears when depth writing is disabled. 2013-03-14 23:59:52 +01:00
degasus
a1c5e90083 Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp
 2013-03-06 15:59:29 +01:00
Jordan Woyak
2b1af36900 Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
NeoBrainX
d0dbcc6369 VideoSoftware: Cleanup PE perf metrics; returning the proper value now. 2013-03-01 01:08:43 +01:00
NeoBrainX
7682ed22c6 Merge branch 'master' into perfqueries. 
Conflicts:
	Source/Core/VideoCommon/Src/VideoConfig.h
	Source/Core/VideoCommon/VideoCommon.vcxproj.filters
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
 2013-03-01 01:07:34 +01:00
Rachel Bryk
0c16489c39 Merge branch 'VideoSoftware-savestates' 2013-02-28 13:36:29 -05:00
Jordan Woyak
03ec9a2e08 Kill some unnecessary c_str and use StrToWxStr in a few places that I missed. 2013-02-28 02:40:03 -06:00
Jordan Woyak
56f09d3b91 Attempt to be consistent with conversions between std::string and wxString. 2013-02-28 02:30:05 -06:00
Rachel Bryk
46f5c19c6d Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right? 2013-02-26 18:52:38 -05:00
Rachel Bryk
08fe3c213a Abort loading states from incompatible graphics backends. 2013-02-26 18:28:56 -05:00
Ryan Houdek
717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
degasus
4883fa268f Split VideoBackend::Cleanup from Shutdown. 
First is called from ogl/d3d thread, second is called from emulation thread (x11...)
 2013-02-26 16:42:32 +01:00
Rachel Bryk
db838e759b Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed. 2013-02-26 01:36:24 -05:00
Rachel Bryk
415a2f17c9 Begin implementing save states to video software. Kind of works, sometimes. 2013-02-25 20:05:02 -05:00
degasus
a629dea4dc Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...
 2013-02-18 18:49:20 +01:00
Jordan Woyak
53aec6c476 Fix OGL perf queries and make them not slow! 2013-02-16 19:30:24 -06:00
NeoBrainX
6fd96a162f Video_Software: Fix ZComploc option breaking stuff. 2013-02-15 17:55:16 +01:00
NeoBrainX
fb0102d441 Video_Software: Fix the ZFreeze option doing nothing. 2013-02-15 17:47:29 +01:00
NeoBrainX
183ad0c628 Video_Software: Toggable zfreeze and early_z support for testing. 2013-02-15 17:45:33 +01:00
Glenn Rice
f7fa33f2d6 Fix remaining compiler warnings. 2013-01-31 15:29:29 -06:00
degasus
c05f66bdd0 first try for osx core profile 
now it doesn't crash, but it still hangs on startup
 2013-01-31 12:20:17 +01:00
Glenn Rice
0ffdd2607f Fix the majority of the compiler warnings unearthed by the addition of 
the new warning flags.
 2013-01-29 23:24:51 -06:00
Lioncash
efe8c75424 Duplicate condition fix. 
Thanks j4ck.fr0st
 2013-01-25 21:30:29 -05:00
Ryan Houdek
73eb98ed8e Move swap control to the host specific GLInterface files. 2013-01-24 10:31:08 -06:00
degasus
e0ffdda26e Merge branch 'immediate-removal' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
 2013-01-24 16:58:28 +01:00
degasus
d60cc373d1 Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae" 
This reverts commit d0301ca89d.

Conflicts:
	.gitignore
 2013-01-24 16:11:07 +01:00
lioncash
2db0c4270e Fix a potential memory leak on non-windows systems. 
Also added a FIXME to BPStructs.cpp and BPMemLoader.cpp
 2013-01-24 08:21:08 -05:00