Commit Graph

3323 Commits

Author SHA1 Message Date
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
ff5ac8c505 fix win compiler errors 2013-01-14 20:08:53 +01:00
5fe3def64c videoConfig cleanup 2013-01-14 20:00:33 +01:00
adeac6f4a5 remove old deprecated calls and fixed functions parameters 2013-01-14 17:48:38 +01:00
c3aafc77b3 upload complete uniform buffer at once
this is the way of dx11. it would upload more per draw, but uses less calls.
will be faster if many uniforms are changed, but slower else
2013-01-14 13:58:11 +01:00
b18c0a5d1b remove ubo for efb2ram 2013-01-14 12:37:31 +01:00
5dbc3b3219 replace this->Bind with Bind 2013-01-13 03:33:11 -06:00
eca93c4c19 Eliminate nearly all the _connect_macro_ ugliness by using wxw's newish Bind functions.
Unlike Connect, Bind is quite type-safe.
I also seem to have fixed some errors in the input config dialog.
2013-01-13 03:06:56 -06: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
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
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
e204a6e015 Add some TODOs. 2013-01-08 18:56:01 +01:00
be706a3977 Disable color writing when alpha test always fails. 2013-01-08 18:56:01 +01:00
d26bcb0847 Move alpha pretest to BPMemory.h and rename a bunch of alpha testing related stuff 2013-01-08 18:56:01 +01:00
876eee5e60 PixelShaderGen: Don't disable depth texture emulation if z writing is disabled (this is what VideoSoftware is doing). 2013-01-08 18:16:48 +01:00
e979b2d4a2 DX11: Fix a small mistake.
Remove some incorrect and/or confusing comments.

Fixes issue 5251. Thanks to limburgerite :)
2013-01-08 18:16:48 +01:00
d0301ca89d Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae 2013-01-07 13:47:34 -06: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
64afbade33 Fix 4 warnings on OSX 2012-12-30 04:32:37 -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
b4f30e549e Missed a precision qualifier in a HWRasterizer shader. 2012-12-29 21:50:07 -06: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
2d4c3c7c91 Beautify some tabs. 2012-12-26 10:33:45 -06:00