Commit graph

  • 871023bff5 finally finished to create OpenGL extension calls Dorian Fevrier 2014-10-20 22:34:22 -04:00
  • 7bc04fda0d Merge pull request #13 from fayvel/win_config Richard Goedeken 2014-09-15 21:18:49 -07:00
  • 96b3cb7eb6 Fix Config file loading under Windows Fayvel Victor 2014-09-15 11:36:42 +02:00
  • a46d607181 SetCombinerAndBlender where run after each vertex where prepared. This has no sens anymore so it now run just before the drawTriangle. Dorian Fevrier 2014-08-24 16:28:55 -04:00
  • 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. Dorian Fevrier 2014-08-24 15:25:39 -04:00
  • 3fad8a61ff tiny fixes, add TGR hack to see texts Dorian Fevrier 2014-08-24 15:10:08 -04:00
  • 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. Dorian Fevrier 2014-08-17 18:43:29 -04:00
  • 0a2c1b2388 remove SetMux and related private properties Dorian Fevrier 2014-08-16 17:12:27 -04:00
  • 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. Dorian Fevrier 2014-08-10 15:58:03 -04:00
  • 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). Dorian Fevrier 2014-08-06 00:33:48 -04:00
  • 8df95b38de remove useless inheritance in OGLCombiner Dorian Fevrier 2014-08-05 22:08:51 -04:00
  • 5d5201d05f Remove unused variables (from 29bf802180) and empty functions. Dorian Fevrier 2014-08-04 22:59:47 -04:00
  • 885d2fccd4 merge two structs (vertex) and make GBI2 vertex demux more consistant with doc Dorian Fevrier 2014-08-04 22:42:47 -04:00
  • a0b205c38d Shader based ColorCombiner cleanup and remove tracking of update information that are not used anymore Dorian Fevrier 2014-08-04 22:07:45 -04:00
  • d893b49122 Remove SetFogMinMax function from CRender as it's useless, Color Combiner now directly use the RDP state Dorian Fevrier 2014-08-03 16:44:54 -04:00
  • 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 Dorian Fevrier 2014-08-03 16:39:11 -04:00
  • 8c8fb26690 merge OGLExtRender with OGLRender class. Potentially create some memory leak as the constructor and destructor are empty. Dorian Fevrier 2014-08-03 15:15:27 -04:00
  • 30fa02ee58 Remove deprecated unused opengl functions Dorian Fevrier 2014-08-03 14:11:14 -04:00
  • 13c60346a1 improve various draw texture rect, trying to use byte and avoid float conversions Dorian Fevrier 2014-08-03 00:07:54 -04:00
  • 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. Dorian Fevrier 2014-08-02 23:10:23 -04:00
  • 16af55f430 consider texture env add/sub always exists. Actually, I should replace this old uneffective OGL combiner by the new OGL shader based combiner Dorian Fevrier 2014-08-02 22:38:12 -04:00
  • 84fdc7765a [DemuxerCleanup] remove unused variable and dependencies Dorian Fevrier 2014-08-02 22:15:50 -04:00
  • 56a4fcc7d7 [DemuxerCleanup] remove optim for limited hardware Dorian Fevrier 2014-08-02 22:10:21 -04:00
  • 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. Dorian Fevrier 2014-08-02 21:58:16 -04:00
  • 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. Dorian Fevrier 2014-08-02 18:08:39 -04:00
  • ba65b164da remove unused/uncalled functions Dorian Fevrier 2014-08-02 17:44:17 -04:00
  • 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 Dorian Fevrier 2014-07-29 19:01:48 -04:00
  • dab443caea remove GeneralCombiner as it's not used anyway Dorian Fevrier 2014-07-28 21:35:14 -04:00
  • 0f0f8a2b79 remove unused empty function Dorian Fevrier 2014-07-27 23:28:45 -04:00
  • be7c660960 remove unused PostProcessDiffuseColor, now all of this is done in the Color Combiner Dorian Fevrier 2014-07-27 23:28:03 -04:00
  • 506f7cd6d3 remove totally unused specular color Dorian Fevrier 2014-07-27 22:53:13 -04:00
  • 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. Dorian Fevrier 2014-07-27 17:30:20 -04:00
  • cf0b8574f6 Replace use of IColor Dorian Fevrier 2014-07-27 16:37:16 -04:00
  • 42be3fd8e8 use glTexSubImage2d instead of glTexImage2d for texture update Dorian Fevrier 2014-07-25 22:38:27 -04:00
  • 6aac5a4e6a Remove OGL 1.4 combiner Dorian Fevrier 2014-07-25 00:04:47 -04:00
  • 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. Dorian Fevrier 2014-07-20 23:45:38 -04:00
  • 134f5dc1e7 Merge pull request #12 from fayvel/travisci Richard Goedeken 2014-07-07 22:04:08 -07:00
  • dd605797d8 Add Travis CI configuration file for automatic build tests Fayvel Victor 2014-07-06 10:31:02 +02:00
  • 659d45e7b6 Merge pull request #11 from Narann/master Richard Goedeken 2014-07-05 21:49:07 -07:00
  • 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 Dorian Fevrier 2014-07-02 02:29:01 -04:00
  • 8c6a8c8058 remove deprecated vertex shader Dorian Fevrier 2014-06-26 00:18:43 -04:00
  • b04c8953d0 fix fog. Now fog vertex coordinate use a good value Dorian Fevrier 2014-06-25 23:27:00 -04:00
  • 82bf6f2c44 remove old if-ogl checks Dorian Fevrier 2014-06-24 15:11:33 -04:00
  • 40c2bbba9d Remove every mirror extension check as OGL hardware mirroring is in core since OGL1.5. This also remove some unused software mirroring code Dorian Fevrier 2014-06-17 23:43:24 -04:00
  • 381fcde5f8 Code cleanup. Remove a lot of extension checks for unused variables Dorian Fevrier 2014-06-17 22:57:24 -04:00
  • 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 Dorian Fevrier 2014-06-12 00:11:27 -04:00
  • 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. Dorian Fevrier 2014-06-11 22:23:15 -04:00
  • 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 Dorian Fevrier 2014-06-11 21:34:31 -04:00
  • b8f7ef821c remove OGL 1.4V2 Dorian Fevrier 2014-06-01 17:27:37 -04:00
  • 07fd410548 Merge pull request #10 from Narann/master Richard Goedeken 2014-05-24 22:58:04 -07:00
  • 69d61bfbd8 remove usnused code Dorian Fevrier 2014-05-24 14:45:04 -04:00
  • e9a0b3646a remove unused code Dorian Fevrier 2014-05-24 14:36:33 -04:00
  • d1877f7608 Merge pull request #9 from Narann/master Richard Goedeken 2014-05-19 17:09:08 -07:00
  • 3491f08a3c fix config updater (offset values was wrong) Dorian Fevrier 2014-05-17 23:55:05 -04:00
  • 32b38993cf fix code formating alignement Dorian Fevrier 2014-05-17 23:49:59 -04:00
  • f48d19313e remove CNvTNTCombiner (should have been removed with TNT2 stuff Dorian Fevrier 2014-05-17 23:43:38 -04:00
  • 6a3bb174f8 remove DirectXDecodedMux files (not used anymore) Dorian Fevrier 2014-05-17 17:37:22 -04:00
  • 9bed10381d remove OGL_1_3_DEVICE and COGLColorCombiner2, update config Dorian Fevrier 2014-05-17 17:34:45 -04:00
  • ef6e6698ee remove OGL 1.2 device, make config update more explicit Dorian Fevrier 2014-05-17 17:11:40 -04:00
  • 53bfc907b7 use 2 separate checks for config api Richard Goedeken 2014-05-14 22:24:30 -07:00
  • 6643daa97b Merge pull request #8 from Narann/master Richard Goedeken 2014-05-14 22:18:39 -07:00
  • 970af0ef27 use ConfigSetParameterHelp, put the whole update process in a single version increment Dorian Fevrier 2014-05-11 21:34:52 -04:00
  • 633737ca66 SDL 1.2 is not deprecated for us, and we shouldnt frighten the user with 6 lines of exclamation points Richard Goedeken 2014-05-04 11:39:34 -07:00
  • 1046fb4455 Switch by default to SDL2 for Mupen64Plus 2.1 Ursula Abendroth 2014-04-21 15:34:22 +02:00
  • 53cd1f519a remove Nvidia Combiner. The way config file is updated is not optimal. The API need to be enhenced before merging. Dorian Fevrier 2014-04-27 15:10:00 -04:00
  • 2486421e80 Merge 19a1f80557 into 4f908e7f85 ursulaabendroth 2014-04-23 17:34:55 +00:00
  • 19a1f80557 Switch by default to SDL2 for Mupen64Plus 2.1 Ursula Abendroth 2014-04-21 15:34:22 +02:00
  • 4f908e7f85 Merge pull request #7 from Narann/master Richard Goedeken 2014-04-21 21:37:59 -07:00
  • 8cd3678653 Merge branch 'rmdx' Dorian Fevrier 2014-04-21 09:44:23 -04:00
  • 8dc41e3ec8 Merge pull request #5 from Narann/master Richard Goedeken 2014-04-20 10:57:43 -07:00
  • 5bda42018d typo fix Dorian Fevrier 2014-04-12 17:07:21 -04:00
  • d5a2e321de Now Rice config params has versionning and a tiny update system Dorian Fevrier 2014-04-12 17:04:45 -04:00
  • 1842ca3f59 remove Anything DirectX related Dorian Fevrier 2014-04-06 15:48:53 -04:00
  • 4d4b5fb0a3 remove OGLCombinerTNT2 Dorian Fevrier 2014-04-06 15:21:55 -04:00
  • 9f7085ed6f Remove deprecated conditions and a unused variable Dorian Fevrier 2014-04-06 15:01:00 -04:00
  • a2e6b62a3f Merge pull request #4 from krnlyng/gles Richard Goedeken 2014-02-04 18:44:48 -08:00
  • 2742a0ceb5 add an option to build against GLES2 instead of OpenGL Frajo Haider 2014-02-04 21:00:00 +01:00
  • c7e10c4874 android: Add android edition customizations. littleguy77 2014-01-30 09:08:43 -05:00
  • a3a364df32 build: Add android makefile. littleguy77 2014-01-30 09:08:23 -05:00
  • 6f69a38c5c Merge pull request #3 from littleguy77/cleanup Richard Goedeken 2014-01-29 21:35:15 -08:00
  • ddd7480a55 Remove duplicate function call. Lioncash 2014-01-28 21:09:39 -05:00
  • 22e914ae1d Minor formatting nits in OpenGL ES2 shader program. littleguy77 2014-01-28 21:07:26 -05:00
  • 63f200b3c6 Merge pull request #2 from littleguy77/zelda-missing-heart-fix Richard Goedeken 2014-01-28 17:42:44 -08:00
  • 8b346d7f71 Merge pull request #1 from littleguy77/gles2-shader-texture-fixes Richard Goedeken 2014-01-28 17:41:01 -08:00
  • 6a3d0aac2f Add hack-fix to show last heart and map arrows in Zelda OoT & MM. Gillou68310 2014-01-27 18:41:35 -05:00
  • aeb3cc31c6 Remove unneeded macro in osal_opengl. littleguy77 2014-01-27 18:40:30 -05:00
  • 396b9df025 GLES2: Fix (re-implement) fog/alpha shaders in OpenGLES2 codepath. Gillou68310 2014-01-27 18:40:20 -05:00
  • d9c1b73d74 GLES2: Use config file to disable mipmapping rather than hard code. littleguy77 2014-01-27 18:39:48 -05:00
  • 80cc1e4427 GLES2: Fix (re-implement) multi-texture in OpenGLES2 codepath. Gillou68310 2014-01-27 18:39:36 -05:00
  • cb6db1a90e Force line ending type for specific files Sven Eckelmann 2013-12-19 14:17:38 +01:00
  • 3df8090f8c Convert .hgignore to .gitignore Sven Eckelmann 2013-12-19 14:13:38 +01:00
  • 6d31248078 add missing break statement which probably wont have any consequence Richard Goedeken 2013-10-30 21:40:11 -07:00
  • 9b18311048 Don't fail rebuild when header is removed Sven Eckelmann 2013-09-20 10:31:57 +02:00
  • 5cc9bc28d6 Fixed warning for implicit declaration of memcpy on unix/gcc. Rudy Matela 2013-09-01 19:41:48 -03:00
  • abd881dbab Fix a warning/error when building with Android-NDK r9 toolchain. littleguy77 2013-08-30 13:38:04 -04:00
  • fe59f6d43a simplify OSX platform detection in makefile using xcode-select. based on patch from John Pender richard42 2013-07-08 07:47:02 -07:00
  • bfba0697f4 Added tag 2.0 for changeset 1704a3674f72 Richard Goedeken 2013-07-04 15:48:50 -07:00
  • 4fb7c9fb84 update version number to 2.0 2.0 Richard Goedeken 2013-07-03 07:16:32 -07:00
  • 280290a8af update text files for upcoming 2.0 release Richard Goedeken 2013-06-27 22:19:42 -07:00
  • 08a11167e3 Initialize all members of ExtTxtrInfo before copying to gTxtrDumpInfos Sven Eckelmann 2013-06-17 21:37:39 +02:00