b18c0a5d1b
remove ubo for efb2ram
2013-01-14 12:37:31 +01:00
f3d663c2f4
efb2tex without ubo
2013-01-12 16:29:16 +01:00
2838077313
fix warnings
2013-01-11 21:24:59 +01:00
8651b34e22
also add vertex shader for efb2tex
...
goodbye fixed-function shaders
2013-01-11 15:41:42 +01:00
7c01c2bf11
move efb2ram shaders to textureCache
2013-01-11 15:24:43 +01:00
60b8e4fb1c
vertex shader for texture converter
2013-01-11 11:59:42 +01:00
092a99cbd2
glsl shaders for showEfbCopyRegions
2013-01-09 20:08:55 +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
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
c2898748ac
bind locations _before_ link program, fix dest alpha
2012-12-31 02:34:27 +01:00
30dd9c2e17
always calls glBindBuffer(0) after disabling vao
2012-12-29 12:50:42 +01:00
e9d00bfeeb
revert RasterFont optimization
...
isn't needed and also not tested and buggy
2012-12-29 00:37:50 +01:00
d9f3fc4495
fix ubo for intel cards (also amd?)
2012-12-28 17:06:08 +01: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
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
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
e2489196e4
Got overzealous. We aren't removing CG quite yet with this branch.
2012-12-26 00:41:25 -06:00
9a58f9a3bb
Rename another function...
2012-12-26 00:34:09 -06:00
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
bff0faea2d
Merge branch 'immediate-removal'
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
399a6af66d
revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough
2012-12-25 12:22:02 +01:00
2fedab3bad
OGL: Make OSD messages fade out properly instead of having them disappear spontaneously.
2012-12-24 19:50:16 +01:00
9209253e0d
Initial removal of Nvidia CG. Still some more cleanup to go
2012-12-24 11:09:52 -06:00
296b9b1c16
Small bit of clean up in GLES-software.
2012-12-24 09:37:12 -06:00
85ac76e8e2
fix gcc compilation
2012-12-19 23:42:22 +01:00
b78f5debe6
Initial push of GLES and GLUtil file breakup.
2012-12-17 14:54:20 -06:00
79a7ce4827
move glBindBuffer and glBindVertexArray out of VertexManager
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:52 -06:00
09274e2483
Check texture params before updateing them
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:48 -06:00
61836f8c51
helper for compiling glsl
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:44 -06:00
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
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
23a3336f9a
increase hash size to u64
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:32 -06:00
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
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