The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-13 09:39:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,534 Commits 6 Branches 12 Tags
Commit Graph

23 Commits

Author SHA1 Message Date
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
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
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 d0301ca89d318d8d6e3e7fde9c4b60e470e184e4.

Conflicts:
	.gitignore
 2013-01-24 16:11:07 +01:00
Ryan Houdek
621204f3e8 Fix switching from the different rasterizers 2013-01-19 02:18:39 -06:00
Ryan Houdek
ff9ba67773 Remove the dependency on rectangle textures in the software rasterizer. Also make it the be used by default in the software renderer like it was before. 2013-01-19 00:51:14 -06:00
degasus
bff02b3b73 Merge branch 'arb_framebuffer' into GLSL-master 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
 2013-01-09 11:00:26 +01:00
Ryan Houdek
d0301ca89d Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae 2013-01-07 13:47:34 -06:00
Ryan Houdek
e5d5365bac Fix the last few warnings in Dolphin on my system. 2012-12-30 02:34:14 -06:00
Ryan Houdek
49ed752126 This line in SWRenderer has been wrong ever since the beginning. 2012-12-30 02:12:31 -06:00
degasus
193056493a also use shaderCaches in rasterFont 2012-12-28 00:52:44 +01:00
Ryan Houdek
01cdcc83a3 Merge Fail: Make sure we are using the interface file to get backbuffer dimensions. GL helper function was duplicated. 2012-12-26 13:15:19 -06:00
Ryan Houdek
67c1c6b062 Merge branch 'GLES-software' 2012-12-26 12:54:58 -06:00
Ryan Houdek
2d4c3c7c91 Beautify some tabs. 2012-12-26 10:33:45 -06:00
Ryan Houdek
9a58f9a3bb Rename another function... 2012-12-26 00:34:09 -06:00
Ryan Houdek
296b9b1c16 Small bit of clean up in GLES-software. 2012-12-24 09:37:12 -06:00
Ryan Houdek
b78f5debe6 Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00
degasus
75dd48247f initial release of new RasterFont without color support 
this new design will once create a texture for all chars.
while rendering a string, a list of polygons (position on screen + texture)
for this string is generated on the fly and print at once by glDrawArrays.
atm, there is no support for colors, so everything will display white.

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:28 -06:00
Glenn Rice
992f8be5b0 If video backend initialization fails, have the emulator die gracefully instead of crashing the application. Also a little clean up of the passage of the video window handle to the backend and back. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7248 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-25 21:14:13 +00:00
Soren Jorvang
d83d129c38 Reach over for Plugin_VideoOGL's copy of GLUtil. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7104 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-07 22:01:08 +00:00
Shawn Hoffman
843e8b5f54 vs2010: fix videosoftware build by not requiring Cg dependency (through OGL...) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7072 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-05 04:09:37 +00:00
Soren Jorvang
6d70c14d12 In the SCons build, skip the generation of static libraries 
and just operate on lists of object files instead.

This helps with LTO since LLVM/clang LTO is completely broken
by static libraries. It also helps identify symbol clashes
between components like the former plugins.

Many linkers also expect static libraries to form a strict DAG
which turns out be a difficult rule to uphold in practice,
especially since some of our platforms aren't picky about this.

LTO builds currently appears to crash at runtime because of
the static wx libs.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7056 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-04 00:46:56 +00:00
Soren Jorvang
1619e176ff Use brute force to link the software plugin. 
Not yet functional.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7050 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-03 19:55:30 +00:00