ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,745 Commits 5 Branches 11 Tags 1.3 GiB
Commit Graph

3228 Commits

Author SHA1 Message Date
degasus d9f3fc4495 fix ubo for intel cards (also amd?) 2012-12-28 17:06:08 +01:00
degasus 48ede4dd30 switch to glsl 130, more than OpenGL 3.1 isn't needed 2012-12-28 16:05:14 +01:00
degasus 70c63ce6cf fix dual pass alpha 2012-12-28 14:24:12 +01:00
degasus 82b33471ae cleanup rasterfont 2012-12-28 11:46:00 +01:00
Ryan Houdek 7d93834cd8 Bit more cleanup from removing Nvidia CG 2012-12-27 22:53:07 -06:00
degasus d7f43c7a68 remove cg from windows project files 2012-12-28 01:08:29 +01:00
degasus 193056493a also use shaderCaches in rasterFont 2012-12-28 00:52:44 +01:00
degasus 316a33d1e6 Merge branch 'master' into GLSL-master 
Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
 2012-12-27 10:36:54 +01:00
degasus db5f4c8c20 fix byte order in osd rasterfont 2012-12-26 23:48:33 +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 e2489196e4 Got overzealous. We aren't removing CG quite yet with this branch. 2012-12-26 00:41:25 -06:00
Ryan Houdek 9a58f9a3bb Rename another function... 2012-12-26 00:34:09 -06:00
Ryan Houdek f4e7a280a9 Remove cg.lib from some files for Windows and renaming a function. 2012-12-26 00:07:43 -06:00
Ryan Houdek 01953ff64a Rename the interface files and hopefully fix OSX building. 2012-12-25 19:08:24 -06:00
degasus bff0faea2d Merge branch 'immediate-removal' 
Conflicts:
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
 2012-12-25 12:39:00 +01:00
degasus 399a6af66d revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough 2012-12-25 12:22:02 +01:00
NeoBrainX 2fedab3bad OGL: Make OSD messages fade out properly instead of having them disappear spontaneously. 2012-12-24 19:50:16 +01:00
Ryan Houdek 9209253e0d Initial removal of Nvidia CG. Still some more cleanup to go 2012-12-24 11:09:52 -06:00
Ryan Houdek 296b9b1c16 Small bit of clean up in GLES-software. 2012-12-24 09:37:12 -06:00
degasus 78ff8a769c Merge branch 'osx-savegame-fix' 2012-12-24 13:30:59 +01:00
degasus bd0abb3d2f revert last commit, add CheckInvalidState to VideoBackend 2012-12-23 13:32:23 +01:00
Matthew Parlane e3eebdf591 Fixes swprintf_s issues hopefully. 
Also fixed an include not using correct caps.

According to:
http://connect.microsoft.com/VisualStudio/feedback/details/646532
 2012-12-23 20:25:11 +13:00
Matthew Parlane 089434b719 Apply same force to float fix as has already been done for DX11. 2012-12-23 20:01:58 +13:00
degasus 85ac76e8e2 fix gcc compilation 2012-12-19 23:42:22 +01:00
Ryan Houdek b78f5debe6 Initial push of GLES and GLUtil file breakup. 2012-12-17 14:54:20 -06:00
degasus 79a7ce4827 move glBindBuffer and glBindVertexArray out of VertexManager 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:52 -06:00
degasus 09274e2483 Check texture params before updateing them 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:48 -06:00
degasus 61836f8c51 helper for compiling glsl 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:44 -06:00
degasus 48812f7bf7 update the rasterfont shader to GLSL3.3 - so OGL 3.3 is needed 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:39 -06:00
degasus 1bd21f44b2 custom shader for RasterFont, fix color support 
OpenGL2.0 compatible

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:36 -06:00
degasus 23a3336f9a increase hash size to u64 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:32 -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
degasus c207422987 using of vao, warning: ARB_vertex_array_object is needed 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:25 -06:00
degasus 5c8800968a also check for vbo updates in EncodeToRamUsingShader 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:22 -06:00
degasus 1f1b32b663 only update vbo on changes in XFBSource::Draw 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:19 -06:00
degasus 34b1451fbe cache vbos in TextureCache::TCacheEntry::FromRenderTarget 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:15 -06:00
degasus d0c4332d99 don't update vbo, if there are no changes in Renderer::Swap 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:13 -06:00
degasus bbcb442983 in the end, also Renderer::Swap in vbo 
two last draw-calls are missing:
VertexManager::Draw (see Graphic_Update branch)
RasterFont::printString (perhaps reimplement with an texture)

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:10 -06:00
degasus b41c06a9ac EncodeToRamUsingShader in vbo 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:05 -06:00
degasus 8ea2ddbc50 XFBSource::Draw in vbo 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:59 -06:00
degasus d44228f1b7 TextureCache::TCacheEntry::FromRenderTarget as vbo 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:56 -06:00
degasus 6b3125728b use vbo for ShowEFBCopyRegions 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:53 -06:00
degasus 8b62be2025 fix ShowEFBCopyRegions 
those fancy colors were the result of the usage of non-allocated heap

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:49 -06:00
degasus 6864b40e26 reset glEnableClientState befor every draw 
should be done with VAO, but atm, this is not possible :-(
this also partial revert the fix in fb92c338af (activating texture0 globally).

Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:46 -06:00
degasus 888b5fb061 remove usage of glMultiTexCoord2f 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:27:38 -06:00
Glenn Rice e85438cba0 Clean up gcc/g++ compiler warnings that have accumulated. 2012-12-10 00:40:28 -06:00
rog 30718230b2 Fix some warnings. 2012-12-06 20:25:07 -05:00
rog 97f5b1665f what is this even... 2012-11-26 02:11:52 -05:00