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

61 Commits

Author SHA1 Message Date
degasus 6afc30240a partial revert of 8a6f747408 
texture_rect isn't in core 3.0, so the long texture function must be used
 2013-01-22 00:18:42 +01:00
degasus 8a6f747408 glsl: remove usage of old texture2D* function 2013-01-19 11:07:06 +01:00
degasus d73c950623 cache texture bindings 2013-01-19 01:06:34 +01:00
degasus e7d5b274c0 add stage parameter for texture load, so ogl can bind to the correct sampler 2013-01-19 00:47:48 +01:00
degasus 074f73c641 move utils texture to sampler 8+9 
rasterfont tex will aways bound to samp8.
efb copy utils will be done in samp9.
 2013-01-19 00:39:31 +01:00
degasus 3054d36534 use glBindFragDataLocation instead of glDrawBuffer 2013-01-17 11:16:12 +01:00
degasus b778b86e26 improve texture mipmap count 
GL_TEXTURE_MAX_LEVEL set how many mipmaps should be allocated, but all of them must be created.
GL_TEXTURE_MAX_LOD set how many mipmaps may be used.
 2013-01-16 21:15:07 +01:00
degasus b401131af2 small texcache cleanup 2013-01-16 15:12:39 +01:00
degasus ff889c0e65 use attrib pointers in nativeVertexFormat 2013-01-14 22:59:08 +01:00
degasus 2f78986e2c Merge branch 'Graphic_Update' into GLSL-master 
Conflicts:
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
 2013-01-14 21:36:31 +01:00
degasus adeac6f4a5 remove old deprecated calls and fixed functions parameters 2013-01-14 17:48:38 +01:00
degasus b18c0a5d1b remove ubo for efb2ram 2013-01-14 12:37:31 +01:00
degasus f3d663c2f4 efb2tex without ubo 2013-01-12 16:29:16 +01:00
degasus 2838077313 fix warnings 2013-01-11 21:24:59 +01:00
degasus 8651b34e22 also add vertex shader for efb2tex 
goodbye fixed-function shaders
 2013-01-11 15:41:42 +01:00
degasus 7c01c2bf11 move efb2ram shaders to textureCache 2013-01-11 15:24:43 +01: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
degasus ecedf56eb4 uses the ARB_framebuffer_object syntax 
also require this extention (OGL3.0), but it have one _realy_ big advantage:
- now it's possible to blit between different texture sizes, so all util draw calls can be implemented as blit
 2013-01-03 12:06:47 +01:00
degasus a1ca288555 fix some AMD issues 
This is only a hack. The correct solution would be:
1. don't use GL_TEXTURE_RECT ever. GL_TEXTURE_2D should also be faster
2. use GL_TEXTURE8+ for util textures
3. both
 2013-01-03 09:45:12 +01:00
degasus 30dd9c2e17 always calls glBindBuffer(0) after disabling vao 2012-12-29 12:50:42 +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
Ryan Houdek 9209253e0d Initial removal of Nvidia CG. Still some more cleanup to go 2012-12-24 11:09:52 -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 23a3336f9a increase hash size to u64 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:32 -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 34b1451fbe cache vbos in TextureCache::TCacheEntry::FromRenderTarget 
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
 2012-12-13 15:28:15 -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 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
Ryan Houdek fb92c338af Bit of cleanup and fixing of one issue that was noticeable in SMS with Mario's shadow. 2012-10-27 22:50:06 -05:00
Ryan Houdek c1fd640964 Rebase immediate-removal on master 2012-10-27 17:22:48 -05:00
Shawn Hoffman 31a8424bcc fix formatting uglies introduced in glsl-master branch 2012-10-09 23:54:17 -05:00
Ryan Houdek f8d0c28e53 Set Sampler values at program make time instead of every frame. Fix an issue when The user had UBO support but not Binding support. 2012-10-09 23:42:40 -05:00
Pierre Bourdon 3c6d0fc710 8 spaces indentation -> tabs 2012-10-09 23:41:48 -05:00
Ryan Houdek 7cec31dbf3 Almost there. 2012-10-09 23:33:02 -05:00
NeoBrainX cc0523e55b TextureCache: Properly assign texture hashes when EFB to RAM is used without caching. 
Fixes issue 5472.
 2012-06-20 18:18:21 +02:00
NeoBrainX a5e68ab10e TextureCacheBase: Support dumping individual mipmaps. 2012-05-13 17:41:04 +02:00
NeoBrainX 1446fb33d5 TextureCacheBase: Replace the efbcopy_state member variable of texture cache entries with a more general "texture type" 2012-01-31 19:52:02 +01:00
NeoBrainX cc54ee7d94 TextureCache: Move EFB copy cache code from TextureConverter to TextureCache 2012-01-31 19:51:32 +01:00
NeoBrainX 3b38295cbd TextureCacheBase: De-uglify hybrid EFB copies (documentation needs updating though) 
TextureCacheBase: Fixed dynamic EFB copies being set to normal textures.
 2012-01-31 18:09:35 +01:00
NeoBrainX c5008fe9de TextureCache: Renaming some variables 
OGL: Fix a possible bug at texture dumping
OGL: Add a TODO about a possible bug
 2012-01-31 18:09:34 +01:00
Ryan Houdek d021f9e3b6 Here we go with the texture cache 2011-08-25 04:28:29 -05:00
smelenchuk 7a9a47376f roll back r7431 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7432 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-04-01 01:46:18 +00:00
smelenchuk 15c51c37f3 Add a "force no texture filter" option, useful for some 2D games (like Mega Man 10) and people who like their pixelated graphics. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7431 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-04-01 01:35:07 +00:00
Glenn Rice ba54fac9eb Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-28 20:40:15 +00:00
Nolan Check f0c5cc76a9 Add EFB encode-to-RAM support in DX11 backend. It could probably be simplified a lot, and not all the possible formats are implemented. I tried to use the dynamic-linking feature of shader model 5, but Microsoft's HLSL compiler is broken. "Dynamic mode" is implemented, but disabled for now. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7253 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-26 23:41:02 +00:00
Soren Jorvang d93dc23e77 Modal dialogs must be closed with EndModal() or all kinds of weird 
corruption can happen with wx 2.9.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7092 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-06 15:02:26 +00:00
Soren Jorvang 955e3abe9e Clean out the long since bit-rotted video profiling code. 
Profiler.{cpp,h} also happened to be the only dupliated
filenames left in Source, the absence of which should make
link-time optimization easier to get working.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6935 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-01-27 21:57:36 +00:00