Emulation/mupen64plus-video-rice
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-video-rice.git synced 2024-06-12 09:07:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
497 commits 1 branch 10 tags 4.5 MiB
Commit graph

497 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Lamb 9609ab5d70 Merge from upstream 2014-12-02 19:14:38 -06:00
Dorian Fevrier 2121b18ae2 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/OGLExtCombiner.cpp
	src/OGLExtRender.cpp
 2014-12-02 00:29:29 -05:00
Dorian Fevrier 44c948269d actually, glLoadIdentity() where still used, my bad. Also tiny typo fix to make future merge more smooth. 2014-12-02 00:21:53 -05:00
Frajo Haider 5707999627 implement Rotate={0,1,2,3} in the GLES codepath 2014-12-02 00:01:55 -05:00
Gillou68310 f8738b5da2 Use malloc for the temporary framebuffer 2014-12-02 00:01:39 -05:00
Gillou68310 9569ec6a9d GLES2 screenshot support 2014-12-02 00:01:31 -05:00
Fayvel Victor 4505fa5c28 Generate Mipmaps in GLES after texture is loaded 2014-12-02 00:00:29 -05:00
Dorian Fevrier 04a18f0042 manually port fayvel commit 7f20efdb6f) 2014-12-01 23:59:39 -05:00
Fayvel Victor c45b63b383 Fix Config file loading under Windows 2014-12-01 23:54:17 -05:00
Fayvel Victor 84c8d24c52 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-12-01 23:54:00 -05:00
Dorian Fevrier fcb583e1df Manually mimic commit from fayvel 979e0bd847 2014-12-01 23:43:35 -05:00
Richard Goedeken 6f2c4c7678 Merge pull request #17 from krnlyng/rotate 
implement Rotate={0,1,2,3} in the GLES codepath
 2014-11-26 23:17:37 -08:00
Richard Goedeken 4d27362cf6 Merge pull request #16 from paulscode/master 
GLES2 screenshot support
 2014-11-26 23:13:56 -08:00
Gillou68310 b730c3dce9 Use malloc for the temporary framebuffer 2014-11-26 08:27:29 -06:00
Gillou68310 5ba05463e7 Use malloc for the temporary framebuffer 2014-11-26 08:15:46 -06:00
Frajo Haider e9ef968bd5 implement Rotate={0,1,2,3} in the GLES codepath 2014-11-25 14:04:04 +01:00
Gillou68310 94c20e5f66 GLES2 screenshot support 2014-11-24 19:57:33 -06:00
Gillou68310 7287dd41b9 GLES2 screenshot support 2014-11-24 18:53:27 -06:00
Paul Lamb 223e6ff22f Update Android project 2014-11-24 18:20:13 -06:00
Paul Lamb eb373e20e4 Merge from upstream 2014-11-24 18:19:07 -06:00
Richard Goedeken 17f4c69575 Merge pull request #15 from fayvel/gles2_fixes 
OpenGL ES2 fixes
 2014-11-12 16:52:06 -08:00
Fayvel Victor 59a12ba80a Generate Mipmaps in GLES after texture is loaded 2014-11-09 22:15:51 +01:00
Fayvel Victor 7f20efdb6f Limit texture units to 8 to avoid buffer overflows 2014-11-09 22:15:51 +01:00
Fayvel Victor 979e0bd847 Fix preprocessor checks to compile against GLESv2 2014-11-09 22:15:51 +01:00
Paul Lamb 160249849e Update Android project 2014-11-08 18:16:50 -06:00
Paul Lamb 0e4333f9f5 Merge from upstream 2014-11-08 11:29:08 -06:00
Dorian Fevrier 871023bff5 finally finished to create OpenGL extension calls 2014-10-20 22:34:22 -04:00
Richard Goedeken 7bc04fda0d Merge pull request #13 from fayvel/win_config 
Fix Config file loading under Windows
 2014-09-15 21:18:49 -07:00
Fayvel Victor 96b3cb7eb6 Fix Config file loading under Windows 2014-09-15 13:45:30 +02:00
Dorian Fevrier a46d607181 SetCombinerAndBlender where run after each vertex where prepared. This has no sens anymore so it now run just before the drawTriangle. 2014-08-24 16:28:55 -04:00
Dorian Fevrier 778e170103 cleanup now useless texture functions. The point of this texture functions was to generate small textures using the color provided by the combiner. Now we use shader, this is not relevant anymore. 2014-08-24 15:25:39 -04:00
Dorian Fevrier 3fad8a61ff tiny fixes, add TGR hack to see texts 2014-08-24 15:10:08 -04:00
Dorian Fevrier 71842f2388 put the new, shader based, OpenGL combiner (named SecondFragmentCombiner) to the main OGLCombiner class and remove it. This is a big step as now, OGLCombiner can only works with shaders and (kind of) modern OpenGL so Rice now only support >= OpenGL 2.1 devices. 2014-08-17 18:43:29 -04:00
Dorian Fevrier 0a2c1b2388 remove SetMux and related private properties 2014-08-16 17:12:27 -04:00
Dorian Fevrier 64311e25f6 finally able to totally remove the old DecodedMux update. This mean DecodedMux is technically useless. Next step should be a big cleanup to totally remove it. 2014-08-10 15:58:03 -04:00
Dorian Fevrier e2ace28af1 [DemuxerCleanup] Still decrease the scope of DecodedMux class. In the futur, every queries about the combiner mode content (e.i.: What the ColorCombiner is intent to do) will directly use ColorCombiner class methods. I guess it should have worked like this but GPUs had less flexibility. OpenGL now provide enougth control that will make this queries mainly usefull for optimization purpose (e.g.: Texture updates). 2014-08-06 00:33:48 -04:00
Dorian Fevrier 8df95b38de remove useless inheritance in OGLCombiner 2014-08-05 22:08:51 -04:00
Dorian Fevrier 5d5201d05f Remove unused variables (from 29bf802180) and empty functions. 2014-08-04 22:59:47 -04:00
Dorian Fevrier 885d2fccd4 merge two structs (vertex) and make GBI2 vertex demux more consistant with doc 2014-08-04 22:42:47 -04:00
Dorian Fevrier a0b205c38d Shader based ColorCombiner cleanup and remove tracking of update information that are not used anymore 2014-08-04 22:07:45 -04:00
Dorian Fevrier d893b49122 Remove SetFogMinMax function from CRender as it's useless, Color Combiner now directly use the RDP state 2014-08-03 16:44:54 -04:00
Dorian Fevrier b7a67db35a Remove Force fog option (this option actually break a lot of stuff and make most games unplayables Remove OGLRender::SetFogEnable as it now do the exact same thing than CRender::SetFogEnable and so, it useless 2014-08-03 16:39:11 -04:00
Dorian Fevrier 8c8fb26690 merge OGLExtRender with OGLRender class. Potentially create some memory leak as the constructor and destructor are empty. 2014-08-03 15:15:27 -04:00
Dorian Fevrier 30fa02ee58 Remove deprecated unused opengl functions 2014-08-03 14:11:14 -04:00
Dorian Fevrier 13c60346a1 improve various draw texture rect, trying to use byte and avoid float conversions 2014-08-03 00:07:54 -04:00
Dorian Fevrier 3fbdb96c0a [DemuxerCleanup]Merge class DecodedMuxForPixelShader with DecodedMux. This break old OGLCombiner but the plan is to replace it by the new shader based combiner. Also remove some unused optim for limited hardware. 2014-08-02 23:14:43 -04:00
Dorian Fevrier 16af55f430 consider texture env add/sub always exists. Actually, I should replace this old uneffective OGL combiner by the new OGL shader based combiner 2014-08-02 22:43:09 -04:00
Dorian Fevrier 84fdc7765a [DemuxerCleanup] remove unused variable and dependencies 2014-08-02 22:15:50 -04:00
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