NeoBrainX 3253603ae7 Merge 'master' into shader-uids-awesome. ...

Conflicts:
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h

2013-03-26 22:21:19 +01:00

..

FramebufferManager.cpp

Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae"

2013-01-24 16:11:07 +01:00

FramebufferManager.h

Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)."

2013-01-16 15:46:11 -05:00

Globals.h

Eliminated the plugin interface. Merged DX9/DX11/OGL video plugins into Dolphin. It could still use a lot of cleanup. Lots of things are still named "plugin". Software renderer is temporarily disabled until it gets some namespaces. I only updated vs08/10, Linux/OSX builds are broken.

2011-01-31 01:28:32 +00:00

GLUtil.cpp

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +01:00

GLUtil.h

Set GLES Tex2D function to texture2D, texture is only available in GLES3. Fix some tabs in the config file.

2013-03-18 07:50:52 +00:00

main.cpp

implement 4xSSAA for OGL

2013-03-25 15:45:10 +01:00

main.h

Eliminated the plugin interface. Merged DX9/DX11/OGL video plugins into Dolphin. It could still use a lot of cleanup. Lots of things are still named "plugin". Software renderer is temporarily disabled until it gets some namespaces. I only updated vs08/10, Linux/OSX builds are broken.

2011-01-31 01:28:32 +00:00

NativeVertexFormat.cpp

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +01:00

PerfQuery.cpp

Kill warning.

2013-03-02 23:00:14 -06:00

PerfQuery.h

Kill warning.

2013-03-02 23:00:14 -06:00

PixelShaderCache.cpp

Open std::fstream in a unicode-safe manner.

2013-02-28 19:33:39 -06:00

PostProcessing.cpp

fix wrapping in postprocessing

2013-03-08 09:36:28 +01:00

PostProcessing.h

reimplement postprocessing and fix one shader as example

2013-03-07 17:00:11 +01:00

ProgramShaderCache.cpp

Merge 'master' into shader-uids-awesome.

2013-03-26 22:21:19 +01:00

ProgramShaderCache.h

Merge 'master' into shader-uids-awesome.

2013-03-26 22:21:19 +01:00

RasterFont.cpp

merge glsl headers into one place

2013-02-13 21:34:48 +01:00

RasterFont.h

Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae"

2013-01-24 16:11:07 +01:00

Render.cpp

ogl: fix virtual xfb

2013-03-25 23:23:32 +01:00

Render.h

implement 4xSSAA for OGL

2013-03-25 15:45:10 +01:00

SamplerCache.cpp

make samplercache global and call constructor/destructor

2013-02-26 18:30:13 +01:00

SamplerCache.h

make samplercache global and call constructor/destructor

2013-02-26 18:30:13 +01:00

stdafx.cpp

Minor code formatting:

2010-09-28 02:15:02 +00:00

stdafx.h

Minor code formatting:

2010-09-28 02:15:02 +00:00

StreamBuffer.cpp

move ogl-only settings into backend

2013-03-25 15:14:24 +01:00

StreamBuffer.h

Switch to using bitfields in the streambuffer class so we can exclude buggy streambuffer types. This disables pinned memory on ATI for GL_ELEMENT_ARRAY_BUFFER because it seems to be buggy. This fixes ATI for me.

2013-03-23 15:37:01 -05:00

TextureCache.cpp

remove some ogl error

2013-03-17 12:46:30 +01:00

TextureCache.h

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +01:00

TextureConverter.cpp

merge glsl headers into one place

2013-02-13 21:34:48 +01:00

TextureConverter.h

use renderbuf fo xfb

2013-01-16 01:37:00 +01:00

VertexManager.cpp

Merge 'master' into shader-uids-awesome.

2013-03-26 22:21:19 +01:00

VertexManager.h

create StreamBuffer class for ogl upload

2013-01-31 23:11:53 +01:00

VertexShaderCache.cpp

Open std::fstream in a unicode-safe manner.

2013-02-28 19:33:39 -06:00

VideoBackend.h

Split VideoBackend::Cleanup from Shutdown.

2013-02-26 16:42:32 +01:00