Commit graph

497 commits

Author SHA1 Message Date
Dorian Fevrier 6ec04a31d1 Merge pull request #50 from rlabrecque/patch-1
Fix crash if RiceVideoLinux.ini can not be found
2015-03-12 09:31:28 -04:00
Riley Labrecque 5369ebb923 Fix crash if RiceVideoLinux.ini can not be found
This fixes a null pointer usage crash that I get every single time that I set up m64p from source on Windows when I don't have any config or data files moved over yet.
2015-03-12 04:11:37 -06:00
Dorian Fevrier 152f2e47bf typo fix and ensure GLES only use RGBA (for now...) 2015-03-12 00:34:20 -04:00
Dorian Fevrier b5f6654d19 fix tiny GLSL error when we were trying to use an alpha of a vec3 variable... 2015-03-10 23:25:12 -04:00
Dorian Fevrier 3cc8730925 fix buffer overflow on log printing 2015-03-10 23:15:34 -04:00
Richard Goedeken 3b9d2ab337 added project/solution file for Visual Studio 2013. removed older MSVS project files. fix code compatilibity problems with MSVC 2015-02-22 07:13:34 -08:00
Dorian Fevrier 1871971e6a Merge pull request #44 from gizmo98/RPI-compatibility
Makefile: Add VC target for raspberry pi
2015-02-18 21:25:50 -05:00
gizmo98 754302d24f Makefile: VC target for raspberry pi
Add VC target with broadcom includes and libs so mupen64plus-video-rice can be build for raspberry pis broadcom soc.
Compiles and runs. The default settings must be tuned (ScreenUpdateSetting=6).
2015-02-17 19:30:34 +01:00
Dorian Fevrier fa4e653f56 Merge pull request #1 from gizmo98/patch-3
Makefile: Add VC option
2015-02-12 08:01:39 -05:00
gizmo98 eb85e422ad Makefile: Add VC option
@Narann 
This is necessary for raspberry pi. I know you dislike it. But i have no other way atm to pass GL paths and broadcom libs.
2015-02-12 07:09:39 +01:00
Dorian Fevrier 36f1fab96e Merge pull request #43 from littleguy77/master
Revert "implement Rotate={0,1,2,3} in the GLES codepath"
2015-01-27 22:28:05 -05:00
littleguy77 e08215cb3a Revert "implement Rotate={0,1,2,3} in the GLES codepath"
This reverts commit e9ef968bd5.
2015-01-27 09:19:39 -05:00
Dorian Fevrier 165a9f9130 add OpenGL ERROR handling to texture creation 2015-01-12 23:25:51 -05:00
Dorian Fevrier 369e3b235c remove deprecated behavior of EnableTextureUnit and useless functions using it 2015-01-12 23:24:01 -05:00
Dorian Fevrier a531ce13a5 Merge remote-tracking branch 'upstream/master' 2015-01-12 23:21:21 -05:00
Richard Goedeken eb4475ec4b Merge pull request #39 from Gillou68310/master
Added project file for MSVC2010
2015-01-07 22:54:48 -08:00
Richard Goedeken 223d04e9ea Merge pull request #38 from mupen64plus-ae/vanilla
Merge Android Edition history
2015-01-07 22:44:04 -08:00
Gillou68310 7dc68f3610 Added project file for MSVC2010 2015-01-07 15:11:54 +01:00
Dorian Fevrier 6b9b76c57e fix some filtering problems. Good filter where applied on texture unit 0 and texture unit 1 but other textures where binded to those units _after_ without set the filter. This commit place the applyFilter function at a more efficient place 2015-01-06 23:51:18 -05:00
Dorian Fevrier df557a58c2 put graphic context pointer back to public to avoid clang cpp spec interpretation clash 2015-01-04 22:39:02 -05:00
Dorian Fevrier dbfe9c4e89 add a convenient way for OpenGL to get limits instead of direct access 2014-12-30 01:17:06 -05:00
Dorian Fevrier cf1f1ac257 GraphicContext class cleanup, make code easeir to use, avoid the use of some globals directly 2014-12-30 01:10:02 -05:00
Dorian Fevrier 0057166c1e in OGL, texture filter is binded to the texture, this is not how N64 work and everything should be done in ApplyTextureFilter(). Actually fix a mistake I made few year ago... 2014-12-28 23:47:03 -05:00
Dorian Fevrier 1628e3045b remove deprecated and useless TurnFogOnOff method 2014-12-28 23:20:02 -05:00
Dorian Fevrier 7b760b4917 take a part of the loop interator indepandant out 2014-12-27 02:36:44 -05:00
Dorian Fevrier 8dbebc15ea fix unitialized variables (found using valgrind) 2014-12-27 01:40:21 -05:00
Dorian Fevrier 5911cf3d3b fix back XG2 black marker #36 2014-12-26 21:36:58 -05:00
Dorian Fevrier d9be1ff27e Merge remote-tracking branch 'upstream/master' 2014-12-23 02:29:27 -05:00
Dorian Fevrier 5665013d58 remove three methods related to do texture scaling and ensure power of 2 textures on the CPU side. This methods where actually never called. Also remove members related to this methods 2014-12-23 02:08:59 -05:00
Dorian Fevrier e6066f07c0 unbind texture at the end of each function to avoid problem when Texture are created but not updated instantly. Should fix #28 2014-12-23 01:45:07 -05:00
Dorian Fevrier 5e9dd514a6 fix MK64 disco colors during transition (and certainly other games). I have the impression the original author have the assumption that primColor where use during the FillRect RDP command. I would have really loved to know more about this because from any documentation I can get, primColor is never used with FillRect... 2014-12-23 00:54:31 -05:00
Dorian Fevrier 262858dfb8 fix Seg fault when glGetString() retrun NULL #32 2014-12-21 20:30:30 -05:00
Dorian Fevrier cf62497498 Merge pull request #35 from littleguy77/master
Add documentation comments for polygon offset settings.
2014-12-21 16:30:45 -05:00
Dorian Fevrier 55a9b1e455 decrease code size removing duplicate code path in ConvertRGBA32() 2014-12-21 04:51:00 -05:00
Dorian Fevrier 59be54a4e6 decrease code size removing duplicate code path 2014-12-21 04:37:24 -05:00
littleguy77 dc6cc61824 Add documentation comments for polygon offset settings. 2014-12-20 22:40:44 -05:00
Dorian Fevrier 705dbcb995 Merge remote-tracking branch 'upstream/master' 2014-12-19 01:30:55 -05:00
littleguy77 e8c4647ace build: Remove Android makefile. 2014-12-18 22:03:36 -05:00
littleguy77 9f0f892a23 Merge remote-tracking branch 'upstream/master' 2014-12-18 22:02:05 -05:00
littleguy77 170ca18fbd Add config option to force polygon offset values.
Provides a mechanism to workaround certain mobile hardware quirks.
2014-12-18 01:08:04 -05:00
Richard Goedeken a066f9e819 Merge pull request #33 from littleguy77/master
Allow user/front-end to override polygon offset values
2014-12-17 21:22:21 -08:00
littleguy77 8e4b55a442 Add config option to force polygon offset values.
Provides a mechanism to workaround certain mobile hardware quirks.
2014-12-17 18:12:50 -05:00
Dorian Fevrier aeb36c4111 should fix (again) bad colors on textures for OGLES hardwares supporting BGRA (98%) 2014-12-16 18:32:36 -05:00
Dorian Fevrier eff4e674b0 Finally totally remove the DecodedMux stuff and backport some hacks. 2014-12-16 16:01:53 -05:00
Dorian Fevrier d24eff7ee9 replace GL_MAX_TEXTURE_UNITS in favor of GL_MAX_TEXTURE_IMAGE_UNITS
GL_MAX_TEXTURE_UNITS is not relevant anymore as it represent the number of textures used for fixed pipeline multitexturing. GL_MAX_TEXTURE_IMAGE_UNITS is maybe more relevant but I think we should not rely on this to define how Rice should handle it's N64 texture units.
2014-12-16 13:33:24 -05:00
Dorian Fevrier e212e714f5 remove unused char* as member of OGL context, remove unused string, move some glGetString to avoid to get them at every resize 2014-12-12 17:26:33 -05:00
Dorian Fevrier 7b88d3b8d8 fix glsl shader not working with OGLES 2014-12-05 23:51:17 -05:00
Dorian Fevrier 7273e0aeaa fix bad colors on OGLES textures and unify texture transfert
Basically, rename m_glFmt to its good OpenGL name ("m_glInternalFmt" for "internal format") and create two static const m_glFmt and m_glType
2014-12-05 23:30:23 -05:00
Dorian Fevrier 421aece02c fix USE_GLES compilation 2014-12-03 00:37:10 -05:00
Paul Lamb e48c50542b Merge from upstream 2014-12-02 19:16:16 -06:00