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
b7906b49c9
fix byte order in osd rasterfont
2013-01-07 20:11:26 +01:00
ef32231431
fix screenshots
2013-01-03 21:40:54 +01:00
fc02427d54
xfb draw by blit - disable postprocessing
...
blitting can't do postprocessing - so for postprocessing, we have to add a new stage
2013-01-03 20:44:47 +01:00
b67b1c376d
fix virtual xfb - remove glCopyTexImage2D
...
glCopyTexImage2D isn't in core (and so not supported everywhere) and it cannot store into GL_TEXTURE_RECTANGLE
2013-01-03 18:36:19 +01:00
363ffd3a5f
swap() by blitting
2013-01-03 12:33:18 +01:00
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
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
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
c2898748ac
bind locations _before_ link program, fix dest alpha
2012-12-31 02:34:27 +01: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
49ed752126
This line in SWRenderer has been wrong ever since the beginning.
2012-12-30 02:12:31 -06:00
b2911516de
Disable the warning about va_list being mangled differently now.
2012-12-30 01:42:33 -06:00
b4f30e549e
Missed a precision qualifier in a HWRasterizer shader.
2012-12-29 21:50:07 -06:00
539bf405f2
In memory of calc84.
...
http://dolphin-emu.org
2012-12-30 16:31:38 +13:00
30dd9c2e17
always calls glBindBuffer(0) after disabling vao
2012-12-29 12:50:42 +01: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
e9d00bfeeb
revert RasterFont optimization
...
isn't needed and also not tested and buggy
2012-12-29 00:37:50 +01: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
d9f3fc4495
fix ubo for intel cards (also amd?)
2012-12-28 17:06:08 +01: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
70c63ce6cf
fix dual pass alpha
2012-12-28 14:24:12 +01:00
82b33471ae
cleanup rasterfont
2012-12-28 11:46:00 +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
193056493a
also use shaderCaches in rasterFont
2012-12-28 00:52:44 +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
db5f4c8c20
fix byte order in osd rasterfont
2012-12-26 23:48:33 +01:00
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
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
degasus