Commit graph

347 commits

Author SHA1 Message Date
littleguy77
717b58705b Implement optional frameskip feature. 2015-01-01 14:03:56 -05:00
Franz-Josef Anton Friedrich Haider
6f4b35428c change more GL to GLES2 includes when USE_GLES=1 is used 2015-01-01 15:56:11 +00:00
Dorian Fevrier
47277854d2 Merge branch 'master' of https://github.com/mupen64plus/mupen64plus-video-glide64mk2 2014-12-31 15:24:35 -05:00
Dorian Fevrier
c5998a531b Merge pull request #37 from twinaphex/master
Rewrite MulMatricesC in a more auto-vectorizable way.
2014-12-31 15:21:09 -05:00
Dorian Fevrier
8b0e9b588d Merge pull request #37 from twinaphex/master
Rewrite MulMatricesC in a more auto-vectorizable way.
2014-12-31 15:13:13 -05:00
Richard Goedeken
c435f2ad25 Merge pull request #38 from fayvel/build
Build fixes
2014-12-30 21:33:08 -08:00
Fayvel Victor
3493bd6c33 add extra includes and preprocessor checks for _WIN32 2014-12-30 23:13:29 +01:00
Fayvel Victor
4d8c50a0db use more widely used preprocessor defines for MinGW
The code still uses a lot of WIN32 preprocessor variables which aren't defined
in strict C++-11 mode. But the preprocessor variable _WIN32 seems to be defined
in all modes of MinGW.
2014-12-30 23:13:29 +01:00
Fayvel Victor
fd37e9e1d9 use different swprintf call for _GLIBCXX_HAVE_BROKEN_VSWPRINTF 2014-12-30 23:13:23 +01:00
Fayvel Victor
a8ca72535f use travis ci with clang 2014-12-30 23:13:12 +01:00
Fayvel Victor
378c250fc6 use newer boost for C++-11 compatibility 2014-12-30 23:13:12 +01:00
Fayvel Victor
9593518364 use Unix-compatible SDL include for SDL_thread 2014-12-30 23:13:12 +01:00
Fayvel Victor
d610bff3db use non-strict-ansi mode to build sources
Switch back to gnu++0x until the source can be compiled in strict ansi mode
with MinGW and Travis CI supports C++11 for GCC/Clang. This -std= is
supported by both clang and gcc.
2014-12-30 23:13:12 +01:00
Dorian Fevrier
2e66b4ac81 Merge pull request #36 from krnlyng/gles
include SDL_opengles2.h instead of SDL_opengles.h
2014-12-30 01:43:01 -05:00
twinaphex
154d818993 Fix broken C version of MulMatricesC 2014-12-29 11:19:28 +01:00
Frajo Haider
a4f33ad4b5 include SDL_opengles2.h instead of SDL_opengles.h 2014-12-28 19:28:17 +01:00
Richard Goedeken
9a3f9ffaab more makefile fixes for OSX with xcode 6.1.1 2014-12-25 20:23:56 -06:00
Richard Goedeken
4bbe95d1ee use SDL threads instead of C++11 threads, which are not supported on clang 2014-12-25 10:47:24 -06:00
Richard Goedeken
6a46ad138c update makefile for build with clang on XCode 6.1.1 2014-12-25 10:46:16 -06:00
Richard Goedeken
339ca50a57 clang doesnt have the to_wstring method 2014-12-25 10:44:05 -06:00
Dorian Fevrier
7200662525 Merge pull request #28 from littleguy77/master
Add documentation comments for polygon offset settings.
2014-12-21 16:31:12 -05:00
littleguy77
3a44862160 Add documentation comments for polygon offset settings. 2014-12-20 22:45:09 -05:00
Richard Goedeken
fb7f81dccc Merge pull request #27 from littleguy77/master
Allow user/front-end to override polygon offset values
2014-12-17 21:24:50 -08:00
littleguy77
d31cd8f38a Add config option to force polygon offset values.
Provides a mechanism to workaround certain mobile hardware quirks, such
as those described in issue #21.
2014-12-17 18:34:06 -05:00
littleguy77
33f6df05ea Remove mupen64plus-ae customizations 2014-12-17 18:33:36 -05:00
Richard Goedeken
2322c183d6 Merge pull request #24 from littleguy77/master
Remove build flag for Jolla phone defaults.
2014-12-07 20:08:37 -08:00
littleguy77
5e9843cf18 Remove build flag for Jolla phone defaults. 2014-12-07 01:52:14 -05:00
Richard Goedeken
21c6784698 Merge pull request #20 from krnlyng/adreno
remove ADRENO_ROTATION_HACK
2014-11-26 22:55:06 -08:00
Frajo Haider
7f01a850c1 rename config value rotate to Rotate and move it to the video general section. also introduce a new Makefile parameter CFG_DEFAULTS which can be used to select which config settings should be used by default (currently only for the jolla phone where Rotate=3, aspect=2 and Screen{Width,Height}={540,960} is required to properly render the game) 2014-11-22 12:51:40 +01:00
Frajo Haider
dec1ed7f1a remove ADRENO_ROTATION_HACK and introduce a config value (rotate) for haveing different possible rotation angles 2014-11-22 12:26:23 +01:00
Richard Goedeken
37b984da62 Merge pull request #18 from twinaphex/master
GLES2 fixes
2014-11-14 06:00:35 -08:00
twinaphex
d7afc9c79d Get rid of glEnable/glDisable(GL_TEXTURE_2D) from OGLES combiner -
is fixed-function
2014-11-14 13:23:08 +01:00
Richard Goedeken
6577b73790 Merge pull request #16 from fayvel/gles2_fixes
Check if SDL is build with OpenGL and/or OpenGL ES2 support
2014-11-12 16:53:04 -08:00
Richard Goedeken
c3345b9ba4 Merge branch 'krnlyng-adreno' 2014-11-09 16:21:01 -08:00
Richard Goedeken
a4e8988377 merged adreno rotation hack 2014-11-09 16:20:32 -08:00
Fayvel Victor
17bb9e8301 Check if SDL is build with OpenGL and/or OpenGL ES support 2014-11-09 22:20:58 +01:00
Richard Goedeken
aa58d0073f Merge pull request #14 from krnlyng/gles-clobber
fix suggested by clobber
2014-11-05 16:38:27 -08:00
Franz-Josef Haider
c9df47cc71 Implement a rotation hack, for adreno devices where landscape mode is broken due to a GPU driver bug. This renders the game in portrait mode and rotates the screen contents by 90 degrees, so it can be viewed in landscape mode. 2014-11-05 14:16:47 +01:00
Themaister
e78a43b2ba Look up chroma_color uniform.
Fixes fullscreen swap bug. No more GL_INVALID_OPERATION spamming.
2014-11-05 13:25:13 +01:00
Richard Goedeken
2fdcee3ad4 Merge branch 'krnlyng-sse' 2014-11-04 21:37:52 -08:00
Richard Goedeken
c63ffc37f8 fix makefile conflict 2014-11-04 21:37:33 -08:00
Richard Goedeken
2eeda1514b Merge pull request #12 from krnlyng/gles
add (optional) GLES 2.0 support in glide64mk2
2014-11-04 21:33:49 -08:00
Frajo Haider
ee42abc424 add (optional) GLES 2.0 support in glide64mk2, code taken from mupen64plus-ae 2014-10-30 16:48:30 +01:00
Franz-Josef Haider
c59c1a3168 add an option to build glide64mk2 without SSE support (for platforms which don't have SSE) 2014-10-28 17:02:50 +01:00
Richard Goedeken
b2a7816391 update glide64mk2 .ini file and mupen64plus config defaults with values from Starlord on google group 2014-10-25 13:33:01 -07:00
Richard Goedeken
0e03ad142b Merge pull request #10 from fayvel/obsolete_windows
Remove obsolete #ifdef code sections
2014-07-13 22:25:00 -07:00
Fayvel Victor
856cc9d325 Remove #ifdef OLD_API code section
These sections are from the zilmar Glide64 implementation (unused) and cause
build errors when accidently activated.
2014-07-08 10:07:37 +02:00
Fayvel Victor
c8cff85d81 Remove #ifdef WINPROC_OVERRIDE code sections
These sections are from the zilmar Glide64 implementation (unused) and cause
build errors when accidently activated.
2014-07-08 10:06:46 +02:00
Richard Goedeken
bccb190988 remove unused old code 2014-07-07 22:43:47 -07:00
Richard Goedeken
a930516583 Merge pull request #8 from fayvel/travisci
Add Travis CI configuration file for automatic build tests
2014-07-07 22:04:34 -07:00