Richard Goedeken
947839397f
update Makefile method for finding OSX_SDK_PATH
2017-11-14 16:22:49 -08:00
Dorian Fevrier
18578e3dce
add some missing error checks
2017-09-25 21:52:43 +02:00
Dorian Fevrier
c01419f9f8
Merge pull request #77 from charlemagnelasse/travis-container
...
Use faster container based Travis CI
2017-09-13 11:07:11 +02:00
Charlemagne Lasse
37754be29d
Use faster container based Travis CI
2017-09-01 09:57:14 +02:00
Charlemagne Lasse
197108c223
Let travis handle the package installation directly
...
The before_install currently fails on Travis CI with:
The following packages have unmet dependencies:
libsdl2-dev : Depends: libegl1-mesa-dev
Depends: libgles2-mesa-dev
E: Unable to correct problems, you have held broken packages.
This can currently only be solved by using the apt addon to install
packages.
2017-09-01 09:56:24 +02:00
Dorian Fevrier
e82afa7cf7
opengl limits where never sets, meaning the max texture unit was undefined
2016-10-17 23:39:24 +02:00
Richard Goedeken
e4ffe38dcb
GLES build fix
2016-10-09 12:34:33 -07:00
Richard Goedeken
ae9b5f191c
Merge pull request #65 from charlemagnelasse/master
...
Use Ubuntu Trusty as base system for Travis CI
2016-09-01 18:04:11 -07:00
Charlemagne Lasse
cc16b4d79f
Remove unused Travis CI define __extern_always_inline
2016-09-01 20:37:12 +02:00
Charlemagne Lasse
61782f8c46
Use Ubuntu Trusty as base system for Travis CI
2016-09-01 20:23:59 +02:00
Richard Goedeken
3a90b41a8f
change VS2013 project files to build with the XP-compatible vc120 toolset, so the resulting binaries will run on pre-vista machines
2016-07-13 20:04:06 -07:00
Richard Goedeken
1721d57de2
win32 build fixes
2016-03-17 22:28:34 -07:00
Richard Goedeken
7f1b3c2b1a
Merge branch 'Narann-master', which completely re-writes the Rice Video pipeline to use only modern OpenGL shaders, with no legacy fixed pipeline rendering.
2016-03-06 07:48:24 -08:00
Richard Goedeken
1dc60d50ae
merge Narann branch (WIP Color Combiner Refactoring - pull request 31) into new branch based on current master
2016-03-05 08:28:51 -08:00
Dorian Fevrier
ae8606cd9e
nicer way to handle fraction part of the insert matrix rdp command, thanks to Corn64: c80494e31f
2015-10-15 22:16:13 -04:00
Dorian Fevrier
cf66cc06c5
fix text OSD
2015-10-15 21:46:10 -04:00
Richard Goedeken
7b357cfa8e
Merge pull request #58 from Gillou68310/x64
...
Added x64 configuration to VisualStudio2013 project file
2015-09-12 21:51:54 -07:00
Gillou68310
6123efe696
Added x64 configuration to VisualStudio2013 project file
2015-08-28 17:08:03 +02:00
Dorian Fevrier
a09eb300db
fix win32 build
2015-08-07 20:48:12 -04:00
Richard Goedeken
6cb0f0c0de
Merge pull request #56 from bentley/openbsd
...
Remove unnecessary OpenBSD warning.
2015-06-08 06:37:53 -07:00
Anthony J. Bentley
34baca1c3a
Remove unnecessary OpenBSD warning.
2015-06-08 01:56:56 -06:00
Dorian Fevrier
982ce87155
Merge branch 'master' of https://github.com/Narann/mupen64plus-video-rice
...
Conflicts:
src/OGLExtensions.cpp
2015-06-07 18:25:19 -04:00
Dorian Fevrier
3f30beac0e
reorganize gl functions to fix OSX compilation
2015-06-07 18:23:34 -04:00
Dorian Fevrier
05e8cb8e37
reorganize gl functions to fix OSX compilation
2015-06-07 17:47:31 -04:00
Dorian Fevrier
69e4d3ea7a
Merge branch 'fix_gles'
...
Conflicts:
src/OGLExtensions.cpp
src/OGLExtensions.h
2015-05-22 00:57:58 -04:00
Dorian Fevrier
e34b8d3fda
fix regression on Clay Fighter. This regression seems to have always exists on OpenGL ES code path
2015-05-22 00:50:57 -04:00
Dorian Fevrier
b14242e8e9
fix Win32 compilation errors
2015-05-05 22:32:13 -04:00
Dorian Fevrier
8fd597790f
fix opengl function on Windows
2015-05-02 22:16:01 -04:00
Richard Goedeken
285bea4d07
we also need to use ScreenUpdateSetting=4 as the default on OSX
2015-04-27 06:56:11 -07:00
Richard Goedeken
42093fb63c
update text files and version number for upcoming 2.5 release
2015-04-26 12:33:01 -07:00
Richard Goedeken
055e332a9d
fix build warning
2015-04-26 11:42:36 -07:00
Dorian Fevrier
b8ae4bf2d6
reorganize OGLExtension preprocessors, hopefully fix textures on Windows
2015-04-21 22:58:42 -04:00
Richard Goedeken
16ca101e25
Merge pull request #54 from littleguy77/master
...
Fix build error in Android.
2015-04-20 17:15:28 -07:00
Dorian Fevrier
62f6e7b504
fix function pointer call on windows
2015-04-20 01:27:39 -04:00
littleguy77
7433f07373
Fix build error in Android.
2015-04-19 08:54:10 -04:00
Dorian Fevrier
5633eca0db
ensure windows clipping width/height is always positive
2015-04-17 02:37:22 -04:00
Dorian Fevrier
11eb8f6d87
fix master build on windows
2015-04-13 00:17:05 -04:00
Richard Goedeken
ab9f393e3b
fix build errors in msvc2013
2015-04-12 13:56:00 -07:00
Dorian Fevrier
6597ee5656
ensure compatibility between GLSL 100 (GLES2) and 120 (GL2.1)
2015-04-10 00:11:19 -04:00
Dorian Fevrier
14de6a170d
reenable bgra texture extension
2015-04-08 22:25:12 -04:00
Dorian Fevrier
2871190922
decrease glsl shader char size
2015-04-08 22:04:58 -04:00
Dorian Fevrier
c7027313ff
add precision lowp float for every fragment shader. Thoses are only used in GL ES driver
2015-04-08 21:51:38 -04:00
Dorian Fevrier
a4c2a9fa4c
Merge pull request #53 from gizmo98/fix_gles
...
Fix GLES regression...
2015-04-04 13:32:00 -04:00
gizmo98
fd358622d5
OGLExtensions: Don't use extensions if USE_GLES is defined
2015-03-29 14:02:21 +02:00
gizmo98
4deebf0048
Fix GLES regression...
...
...introduced with https://github.com/mupen64plus/mupen64plus-video-rice/pull/52
2015-03-27 21:14:31 +01:00
Richard Goedeken
48cde6a604
Merge pull request #52 from conchurnavid/includes
...
Cleanup includes order and add missing includes
2015-03-27 08:14:28 -07:00
Dorian Fevrier
02f595f644
change pgl suffix to gl
2015-03-25 22:44:28 -04:00
Conchúr Navid
33d7c8824c
Add missing includes and forward declarations
2015-03-21 13:58:24 +01:00
Conchúr Navid
2491cfebf8
Sort the includes based on type and names
2015-03-21 13:33:24 +01:00
Conchúr Navid
665d5000af
Workaround conflicting defintions of min and max
2015-03-21 13:33:24 +01:00
