NeoBrainX ca22872dae 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/VertexShaderGen.cpp

2013-06-17 12:05:47 +02:00

..

Plugin_VideoDX9

Merge 'master' into shader-uids-awesome.

2013-06-17 12:05:47 +02:00

Plugin_VideoDX11

Merge 'master' into shader-uids-awesome.

2013-06-17 12:05:47 +02:00

Plugin_VideoOGL

Merge 'master' into shader-uids-awesome.

2013-06-17 12:05:47 +02:00

Plugin_VideoSoftware

[Android] Qualcomm drivers require that the EGL context is created on the same thread that the OpenGL commands are run on. Crappy driver limitation since eglMakeCurrent should work to let it be on a different thread.

2013-05-25 22:20:34 -05:00

CMakeLists.txt

[Android] Add in a compiling option for GLES3

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