Flyinghead 2f363a7355 Merge remote-tracking branch 'origin/fh/gl-scale-mat' into fh/vulkan ... # Conflicts: # core/rend/TexCache.h # core/rend/gl4/gles.cpp # core/rend/gles/gles.cpp # core/rend/gles/gles.h # shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj		2019-10-21 19:49:53 +02:00
..
glcache.h	decouple imgui from gles renderer	2019-10-19 18:34:24 +02:00
gldraw.cpp	Merge remote-tracking branch 'origin/fh/gl-scale-mat' into fh/vulkan	2019-10-21 19:49:53 +02:00
gles.cpp	Merge remote-tracking branch 'origin/fh/gl-scale-mat' into fh/vulkan	2019-10-21 19:49:53 +02:00
gles.h	Merge remote-tracking branch 'origin/fh/gl-scale-mat' into fh/vulkan	2019-10-21 19:49:53 +02:00
gltex.cpp	move texture cache to a template class. vulkan: OSD on android	2019-10-21 16:39:16 +02:00
imgui_impl_opengl3.cpp	decouple imgui from gles renderer	2019-10-19 18:34:24 +02:00
imgui_impl_opengl3.h	gui: display VMUs on pause	2019-03-29 17:35:00 +01:00