Commit graph

499 commits

Author SHA1 Message Date
Dorian Fevrier
56a4fcc7d7 [DemuxerCleanup] remove optim for limited hardware 2014-08-02 22:10:21 -04:00
Dorian Fevrier
a102325c4c [DemuxerCleanup] remove tricky optim. The comment in MergeShadeWithConstants explain why we can remove it now: This function should be called afte the mux has been simplified The goal of this function is to merge as many as possible constants with shade so to reduce the totally number of constants to 0 or 1 And at the same time, to reduce the complexity of the whole mux so we can implement the mux easiler when lower end video cards. 2014-08-02 21:58:16 -04:00
Dorian Fevrier
849672cdc2 [DemuxerCleanup] remove tricky optimisation as it will not be needed anymore. UseShadeForConstant: the point was to use the vertex shading color for constant colors (env, prim, etc...) if vertex shading color was not used. 2014-08-02 18:08:39 -04:00
Dorian Fevrier
ba65b164da remove unused/uncalled functions 2014-08-02 17:44:17 -04:00
Dorian Fevrier
6672d7020f Change format type. Should increase texture transfer performances according to https://www.opengl.org/discussion_boards/showthread.php/184561-glTexSubImage2D-with-Buffer-Object-less-efficient 2014-07-29 19:01:48 -04:00
Dorian Fevrier
dab443caea remove GeneralCombiner as it's not used anyway 2014-07-28 21:35:14 -04:00
Dorian Fevrier
0f0f8a2b79 remove unused empty function 2014-07-27 23:28:45 -04:00
Dorian Fevrier
be7c660960 remove unused PostProcessDiffuseColor, now all of this is done in the Color Combiner 2014-07-27 23:28:03 -04:00
Dorian Fevrier
506f7cd6d3 remove totally unused specular color 2014-07-27 22:53:13 -04:00
Dorian Fevrier
79d7db0441 bProcessSpecularColor is never set to true, so consider it as false. PostProcessSpecularColor() always return 0, so act like this. In the future, this post process stuff will be totally removed as ColorCombiner do this in shader. 2014-07-27 17:30:20 -04:00
Dorian Fevrier
cf0b8574f6 Replace use of IColor 2014-07-27 16:37:16 -04:00
Dorian Fevrier
42be3fd8e8 use glTexSubImage2d instead of glTexImage2d for texture update 2014-07-25 22:38:27 -04:00
Dorian Fevrier
6aac5a4e6a Remove OGL 1.4 combiner 2014-07-25 00:04:47 -04:00
Dorian Fevrier
2dbff149a5 Big refactoring. Rewrite the Color Combiner and use a more modern OpenGL approach. I've tried as much a possible to limit the scopeof this commit while solving as much bug as possible. Still a lot of work to do and some know issue but I need to commit now to avoid integrate new bugs while fixing others. 2014-07-20 23:45:38 -04:00
Richard Goedeken
134f5dc1e7 Merge pull request #12 from fayvel/travisci
Add Travis CI configuration file for automatic build tests
2014-07-07 22:04:08 -07:00
Fayvel Victor
dd605797d8 Add Travis CI configuration file for automatic build tests
Github provides a Travis CI integration which makes it easy to have a quick
check of a patch before a pull request is accepted. It is not enough to prove
the correctness of a contribution but at least helps to avoid some of the worst
build problems.

This feature *must* be enabled by the mupen64plus administrator *before this
commit is merged*:

- https://travis-ci.org/profile/mupen64plus
- Login via your Github account
- Make sure you are on "https://travis-ci.org/profile/mupen64plus"
- Switch repository to "On"
2014-07-06 12:32:09 +02:00
Richard Goedeken
659d45e7b6 Merge pull request #11 from Narann/master
Big cleanup, fix fog flicking, fix moveword force matrix (fix trees on SSB64)
2014-07-05 21:49:07 -07:00
Dorian Fevrier
3076663884 Better handle of negative fractionnal part in moveword insert matrix (now the fractionnal part is added/substracted depending on the integer sign). This fix trees deformations in SSB64 2014-07-02 02:29:01 -04:00
Dorian Fevrier
8c6a8c8058 remove deprecated vertex shader 2014-06-26 00:18:43 -04:00
Dorian Fevrier
b04c8953d0 fix fog. Now fog vertex coordinate use a good value 2014-06-25 23:27:00 -04:00
Dorian Fevrier
82bf6f2c44 remove old if-ogl checks 2014-06-24 15:11:33 -04:00
Dorian Fevrier
40c2bbba9d Remove every mirror extension check as OGL hardware mirroring is in core since OGL1.5. This also remove some unused software mirroring code 2014-06-17 23:43:24 -04:00
Dorian Fevrier
381fcde5f8 Code cleanup. Remove a lot of extension checks for unused variables 2014-06-17 22:57:24 -04:00
Dorian Fevrier
9de00e9331 remove GL_ARB_texture_env_combine and GL_EXT_texture_env_combine checks and consider them always true as they both are part of OGL1.3, also clean the constant names 2014-06-12 00:11:27 -04:00
Dorian Fevrier
2814a5e304 As GL_ARB_mutitexture is part of OGL1.3 I removed every part of the code that doesnt considere it as default and update to remove ARB suffixes. 2014-06-11 22:23:15 -04:00
Dorian Fevrier
4242c9305e as fog coordinate array is supposed to be part of OGL1.4, we consider it as always present and remove any code that deal without it 2014-06-11 21:34:31 -04:00
Dorian Fevrier
b8f7ef821c remove OGL 1.4V2 2014-06-01 17:27:37 -04:00
Richard Goedeken
07fd410548 Merge pull request #10 from Narann/master
Code cleanup.
2014-05-24 22:58:04 -07:00
Dorian Fevrier
69d61bfbd8 remove usnused code 2014-05-24 14:45:04 -04:00
Dorian Fevrier
e9a0b3646a remove unused code 2014-05-24 14:36:33 -04:00
Richard Goedeken
d1877f7608 Merge pull request #9 from Narann/master
Remove COGLColorCombiner2 and unused files
2014-05-19 17:09:08 -07:00
Dorian Fevrier
3491f08a3c fix config updater (offset values was wrong) 2014-05-17 23:55:05 -04:00
Dorian Fevrier
32b38993cf fix code formating alignement 2014-05-17 23:49:59 -04:00
Dorian Fevrier
f48d19313e remove CNvTNTCombiner (should have been removed with TNT2 stuff 2014-05-17 23:43:38 -04:00
Dorian Fevrier
6a3bb174f8 remove DirectXDecodedMux files (not used anymore) 2014-05-17 18:01:50 -04:00
Dorian Fevrier
9bed10381d remove OGL_1_3_DEVICE and COGLColorCombiner2, update config 2014-05-17 17:34:45 -04:00
Dorian Fevrier
ef6e6698ee remove OGL 1.2 device, make config update more explicit 2014-05-17 17:11:40 -04:00
Richard Goedeken
53bfc907b7 use 2 separate checks for config api 2014-05-14 22:24:30 -07:00
Richard Goedeken
6643daa97b Merge pull request #8 from Narann/master
Remove Nvidia combiner and anything related, update config.
2014-05-14 22:18:39 -07:00
Dorian Fevrier
970af0ef27 use ConfigSetParameterHelp, put the whole update process in a single version increment 2014-05-11 21:34:52 -04:00
Richard Goedeken
633737ca66 SDL 1.2 is not deprecated for us, and we shouldnt frighten the user with 6 lines of exclamation points 2014-05-04 11:39:34 -07:00
Ursula Abendroth
1046fb4455 Switch by default to SDL2 for Mupen64Plus 2.1
The current version of SDL is 2.0.3. All new releases of distributions contain
this library already. Current Linux distributions and OpenBSD even backporting
patches from Mupen64Plus 2.1 repo to use SDL 2. Android and other mobile
platform don't have support for legacy SDL 1.2.

People like Anthony J. Bentley and Riley Labrecque already requested
a new release of Mupen64Plus 2.1 with SDL2
2014-05-04 11:38:23 -07:00
Dorian Fevrier
53cd1f519a remove Nvidia Combiner. The way config file is updated is not optimal. The API need to be enhenced before merging. 2014-04-27 15:10:00 -04:00
Richard Goedeken
4f908e7f85 Merge pull request #7 from Narann/master
Remove few (very) old code dating from when Rice was DirectX compatible.
2014-04-21 21:37:59 -07:00
Dorian Fevrier
8cd3678653 Merge branch 'rmdx' 2014-04-21 09:44:23 -04:00
Richard Goedeken
8dc41e3ec8 Merge pull request #5 from Narann/master
Remove deprecated conditions and a unused variable
2014-04-20 10:57:43 -07:00
Dorian Fevrier
5bda42018d typo fix 2014-04-12 17:07:21 -04:00
Dorian Fevrier
d5a2e321de Now Rice config params has versionning and a tiny update system 2014-04-12 17:04:45 -04:00
Dorian Fevrier
1842ca3f59 remove Anything DirectX related 2014-04-06 15:48:53 -04:00
Dorian Fevrier
4d4b5fb0a3 remove OGLCombinerTNT2 2014-04-06 15:21:55 -04:00