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

1258 Commits

Author SHA1 Message Date
degasus d0e8217714 remove intel pixel shader hack 
did not work correctly and made warnings on dx11
 2013-02-21 17:44:56 +01:00
Jordan Woyak eae20b77a8 Remove some unneeded sampler-related calls in BPStructs. 2013-02-20 02:01:54 -06: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
degasus 4653adecf1 remove numTexGens=7 hack. only cg wasn't able to handle more then 8 texcoords 2013-02-17 22:37:00 +01:00
Jordan Woyak 537d5ea942 Use omp_get_num_procs to set the number of OpenMP threads rather than our core count detection. 2013-02-16 23:48:20 -06:00
Jordan Woyak d994e56b60 Changes/cleanup to TextureCache::Load and other mipmap related code. 
The significant change is what is now line 520 of TextureCacheBase.cpp:
((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1)
to
TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat);

Fixes issue 5328.
Fixes issue 5461.
 2013-02-15 22:56:29 -06:00
degasus 334bd52f2c NaNs handling in pixel shader 2013-02-15 15:46:31 +01:00
degasus 0325e37bfb merge glsl headers into one place 2013-02-13 21:34:48 +01:00
NeoBrainX ed0abc9dc5 Merge branch 'mipmap_fixes'. 2013-02-07 20:40:33 +01:00
NeoBrainX 6870c1fdd5 Fix some potential issues when blending on EFB formats without alpha. 
Clean up state transition tables.
 2013-02-07 18:01:24 +01:00
degasus 10567cb23f always write to uv coords 2013-02-07 13:23:20 +01:00
degasus dae1226e1b workaround for division by zero on fog calculation 2013-02-07 02:21:30 +01:00
degasus e7a8d3f854 check for GL_ARB_sync, it's in ogl 3.2 2013-02-06 01:05:19 +01:00
degasus f677b8cba3 update to glew1.9, win binaries also from official release 2013-02-04 21:11:12 +01:00
Jordan Woyak 0e04e0c305 Fix some shadowing warnings. 2013-01-29 16:43:22 -06:00
degasus c5fa3e0f3d move RestoreAPIState and ResetAPIState into backends 
it's a backend specific hack, so it should be here
should give a small speedup in dx11 efb2tex
 2013-01-28 18:16:03 +01:00
Lioncash efe8c75424 Duplicate condition fix. 
Thanks j4ck.fr0st
 2013-01-25 21:30:29 -05: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
degasus f69b6b595e change projection_type to u32 
Fix issue 5740

thx @ erwan_taf for debuging all the week
 2013-01-24 13:10:13 +01:00
degasus d5748ebaef fix small dx9 slowdown 2013-01-22 10:49:46 +01:00
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
NeoBrainX 6c0f6ffecf Fix a dumb regression from revision 4925a28f94. 2013-01-19 22:40:20 +01:00
degasus 8a6f747408 glsl: remove usage of old texture2D* function 2013-01-19 11:07:06 +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 714ff50fdf set blending if dual source might be triggered 2013-01-18 00:44:35 +01:00
lioncash 0ef3bd9c77 Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)." 
Turns out I was wrong in my previous commit. My bad.

This reverts commit 8743166663.
 2013-01-16 15:46:11 -05:00
lioncash 8743166663 Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names). 
This also gets rid of some more typecasts in some cases.
 2013-01-16 09:42:51 -05:00
lioncash ddf23094c2 Fix two unsigned/signed mismatch warnings. 2013-01-15 21:15:31 -05:00
Ryan Houdek 9165ac5a67 Fix clipPos not being declared in DX backends. 2013-01-15 10:48:01 -06: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 5fe3def64c videoConfig cleanup 2013-01-14 20:00:33 +01:00
degasus 4c2dd093a3 fix d3d error 2013-01-14 19:17:07 +01:00
degasus b18c0a5d1b remove ubo for efb2ram 2013-01-14 12:37:31 +01:00
NeoBrainX f7b0c8684b BPMemory: Expose more register descriptions for FifoPlayer 2013-01-12 15:25:50 +01:00
Glenn Rice 2cd415dd83 Fix the signed/unsigned comparison warnings created by a recent commit. 2013-01-11 22:00:36 -06:00
Lioncash dfc0c4b08d Fix two signed/unsigned mismatch warnings. 
Also tidied up SDCardUtil - made the variables make more sense (typewise)
 2013-01-11 19:38:04 -05:00
NeoBrainX ad05d568b9 PixelShaderGen: Change error strings to be unique so that we can identify unexpected behavior more easily. 2013-01-11 15:49:20 +01:00
degasus 60b8e4fb1c vertex shader for texture converter 2013-01-11 11:59:42 +01:00
Lioncash f21f097e7a Redundant line of code in VertexShaderManager::Dirty() 
Also cleaned it up.
 2013-01-10 21:44:12 -05:00
NeoBrainX e7c883d6be VideoCommon: Implement proper RGBA8 texture loading from tmem. 2013-01-10 18:30:22 +01:00
NeoBrainX 304814e7cc Video_Software: Implement proper RGBA8 texture loading from tmem. 
For RGBA8 textures, AR and GB tiles are stored in separate tmem banks. TextureDecoder did not support that previously.
 2013-01-10 18:30:16 +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
Lioncash d9ea718559 Fix an issue where an iterator would become invalidated in TextureCache::ClearRenderTargets() 2013-01-08 23:46:30 -05:00
NeoBrainX d3882771aa Fix an assert that had been wrong for ages, apparently. 2013-01-08 18:56:01 +01:00
NeoBrainX 4925a28f94 PixelShaderGen: Shader uid maintainance 2013-01-08 18:56:01 +01:00
NeoBrainX be706a3977 Disable color writing when alpha test always fails. 2013-01-08 18:56:01 +01:00