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
5fe3def64c
videoConfig cleanup
2013-01-14 20:00:33 +01:00
4c2dd093a3
fix d3d error
2013-01-14 19:17:07 +01:00
b18c0a5d1b
remove ubo for efb2ram
2013-01-14 12:37:31 +01:00
60b8e4fb1c
vertex shader for texture converter
2013-01-11 11:59:42 +01:00
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
84debc17d5
fix msaa
...
blitting between msaa fbos may not scale. So we need to resolve the efb before swapping.
2013-01-09 01:50:52 +01:00
b38b62afc6
remove glsl binding support. convert every shader to version 130
2013-01-02 16:56:08 +01:00
91023e133b
Move widescreen hack to enhancements tab.
2013-01-02 01:21:20 -05:00
5fbce28bbc
Save git hash to .dtm header.
2013-01-01 16:34:07 -05:00
c728ef2cd3
Last warning for me on Linux.
2013-01-01 14:42:30 +13:00
4c374cd58a
Improve file search speeds by deleting an unused file.
2012-12-31 15:27:36 +13:00
bcf1f54c65
Optimized the Dolphin SEO process a bit
2012-12-31 02:31:55 +01:00
71bb297f2c
Always count gc controller inputs.
2012-12-30 06:48:37 -05:00
64afbade33
Fix 4 warnings on OSX
2012-12-30 04:32:37 -06:00
ff3b22e1ff
Clear up some warnings that crop up from -Wextra
2012-12-30 03:28:50 -06:00
e5d5365bac
Fix the last few warnings in Dolphin on my system.
2012-12-30 02:34:14 -06:00
539bf405f2
In memory of calc84.
...
http://dolphin-emu.org
2012-12-30 16:31:38 +13:00
cd54d6efdd
Mismatched new/delete.
2012-12-29 22:26:09 +13:00
670ca7e993
Toggle wiimote status based on the actual status, instead of some dumb checkbox that is almost never even right.
...
The checkbox is still wrong when starting emulation, but it's now purely cosmetic.
Actually fixes issue 5594.
2012-12-29 02:48:20 -05:00
ba6564b0b5
Missed a write to depth before discard in PreAlphaTest
2012-12-28 14:48:04 -06:00
9e76a457ff
Beautify the generate pixel shader code
2012-12-28 14:18:39 -06:00
76fc1fe95a
This discard was missing in the alpha pretest area.
2012-12-28 12:18:34 -06:00
3eeebcae45
Another small bit of cleanup as I'm reading it
2012-12-28 12:05:43 -06:00
a25a00640e
Very small cleanup in PixelShaderGen
2012-12-28 11:49:21 -06:00
3ec3b7683e
Fix (dis)connecting wiimotes via hotkey.
...
Fixes issue 5594.
2012-12-28 11:21:08 -05:00
c303669dd0
Clean up some messy code issues that have been annoying me.
2012-12-28 09:58:06 -06:00
48ede4dd30
switch to glsl 130, more than OpenGL 3.1 isn't needed
2012-12-28 16:05:14 +01:00
af2820ac88
Don't show multiple exit confirmation dialogues.
...
Pause emulation while waiting for confirmation to exit.
Fixes issue 5822.
2012-12-28 03:39:34 -05:00
225d29f3f6
Fix this annoying warning in ChunkFile.h
2012-12-27 23:43:59 -06:00
7d93834cd8
Bit more cleanup from removing Nvidia CG
2012-12-27 22:53:07 -06:00
d7f43c7a68
remove cg from windows project files
2012-12-28 01:08:29 +01:00
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
94116bf89c
Always use the right user dir on windows.
2012-12-26 19:55:45 -05:00
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
5169804a61
Remove duplicated X11 code.
2012-12-26 12:12:26 -06:00
93f72d8463
Don't add superfluous whitespace to the CMake file
2012-12-26 11:07:33 -06:00
9a58f9a3bb
Rename another function...
2012-12-26 00:34:09 -06:00
c43a0dac2e
Add to more than 32bit debug
2012-12-26 00:25:49 -06:00
fa9abfdc42
Add a include directory
2012-12-26 00:22:17 -06:00
a35c5a7f22
Add a include directory
2012-12-26 00:20:09 -06:00
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
e9099459bb
Maybe fix Windows compiling.
2012-12-25 22:52:30 -06:00
0de073edea
When using the "Keep window on top option" make sure that the effect of
...
that option ends when emulation ends when using render to main.
2012-12-25 21:12:51 -06:00
c884dbf654
Mistype in WX.cpp
2012-12-25 19:18:03 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
b3ed3bdb91
Define NvOptimusEnablement to tell the Nvidia driver we need high performance
2012-12-25 13:51:13 +01:00
ba348c29d7
Merge branch 'new-ax-hle'
...
Only AX GC is merged so far, the new Wii AX development will be done in a
separate branch when I'll start working on it.
There are still a few AX GC bugs remaining, but overall a lot less games have
sound issues than before.
Thanks to everyone who helped test the development builds of this branch and
reported results on the forum thread.
Conflicts:
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
2012-12-25 13:33:53 +01:00
4a74da3e87
Readd the old AXWii (rename the new version to NewAXWii) and set it as default
2012-12-25 13:30:55 +01:00
bff0faea2d
Merge branch 'immediate-removal'
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
