Commit Graph

980 Commits (master)

Author SHA1 Message Date
hybrid a95789d95a Avoid crash on non-existent textures
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3801 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 14:05:34 +00:00
hybrid d788d95e98 Fix mipmap generation and add support for manually specified mipmaps.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3800 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 13:58:46 +00:00
hybrid ebf22bb137 Fix typo in texture format for FBOs. Adjust stencil and depth buffer support for FBOs. Stencil not yet working, though.
Comment in ogles2 driver fixed. Friend declaration removed, was not necessary.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3799 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 13:25:05 +00:00
hybrid 66342baa24 Fix and enable FBO usage.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3798 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 12:17:27 +00:00
hybrid 2353c2ca02 Add support for some base driver features, e.g. texture lod, blendFunc, polygon offset.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3795 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-05 21:50:36 +00:00
hybrid 5624e58453 Fix missing type also for ogl-es2
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3794 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-05 21:46:47 +00:00
hybrid 922936fff9 Fix compilation problem due to missing type. If this does not happen in all include files, we will have to add a dependent include and typedef.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3793 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-05 21:44:55 +00:00
hybrid 95f84d02d3 Add extension flag for ogl-es2 driver.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3792 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-05 21:42:44 +00:00
hybrid 41ceab2912 Update to latest ogl-es extensions
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3791 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-05 21:25:43 +00:00
hybrid c102e36f20 FBOs does not work properly, so it's kept disabled in the driver.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3790 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-05 00:11:49 +00:00
hybrid ccfed65463 Add all supported features to the queryFeature set.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3789 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-05 00:11:12 +00:00
hybrid 5de03d4887 Enable fbo textures, which work without an extension in the ogl-es2 driver.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3788 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-04 22:44:05 +00:00
hybrid f260d63c19 Fix compilation problems with both ogl-es drivers being enabled at the same time. Currently, the ogles 1.x driver won't work in such a configuration, though, at least with the emulator libs. So make sure you still enable only one ogles driver at a time.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3787 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-04 10:54:58 +00:00
hybrid 9da039ec29 Fix broken copy-paste result
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3786 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-04 10:49:09 +00:00
hybrid 1c6230c4a1 Update to latest powervr SDK, remove unused libs
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3785 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-03 23:20:31 +00:00
hybrid 1a6a61605d Fix 2dmaterial override as in ogl-es2 driver. Remove unused include of windows.h
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3784 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-03 23:17:23 +00:00
hybrid 3c385a3f58 Fix 2doverride variable which wrongly used the material instead of the enable flag.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3783 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-03 12:01:43 +00:00
hybrid 053ea1c177 Some more fixes, sent in by iamacooldude. Also some layout updates and minor cleanups.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3782 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-03 11:32:53 +00:00
hybrid 83fa4c7d81 Fix some problems with recent updates.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3781 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-02 22:34:34 +00:00
hybrid 3e5ac71889 Add Override2dMaterial support and draw2DImageBatch implementation for ogl-es drivers. The latter already exists in ogles2 driver.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3741 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-05-22 20:25:05 +00:00
hybrid 40f2be1ce5 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3727 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-05-18 22:21:50 +00:00
hybrid 1a332f05f6 Fix compilation after recent API changes. Fix submitted by Rene Rivera
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3584 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-02-03 22:52:45 +00:00
hybrid e12163dac4 Fix compilation problems due to last update. Fix vc10 project files
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3562 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-17 08:37:00 +00:00
hybrid 03398457ad Make shader path for ogles2 configurable via define.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3561 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-14 17:30:24 +00:00
hybrid c7a7055a25 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3560 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-01-14 15:36:50 +00:00
hybrid 853ff48888 Fix parameters in ogl2 extension handler, thanks to kine for the hint
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3495 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-12-10 15:48:16 +00:00
hybrid 2ba228a486 New OpenGL-ES 2.x driver. This is a fully shader based render pipeline, which is compatible with, e.g., latest iPhone and other smartphone systems, and embedded devices such as the Pandora game console and the Beagle board.
The whole implementation of the new driver was provided by the folks from Amundis (http://amundis.fr/index.php?lang=en). There are more projects to come from them. Many thanks to Thibault and his colleagues for providing the code for inclusion in the engine.
Please note that you have to remove not only the OpenGL driver (automatically done in IrrCompileConfig once the ogl-es driver is enabled there), but also the linking against the opengl32.lib in the project files. Otherwise no rendering will happen.
Also note that the driver currently does not support all features of the engine. Some materials are not fully working, the shadow system seems to be missing, and the mipmapping is broken. These things will be fixed in future bug fixes.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3370 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-08-08 17:46:48 +00:00
hybrid a8183ff5eb Merged from trunk, revisions 3300-3365. Another large bugfix merge.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3369 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-07-18 21:25:27 +00:00
hybrid 28c067bac4 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3301 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-06-01 22:52:38 +00:00
hybrid cecc853066 Error message check added for egl setup.
Updated to latest OpenGL driver code to fix AntiAlias etc.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3178 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-01-24 20:26:32 +00:00
hybrid 2e64811c73 Make project compilable again. Not all new things ported from OpenGL, yet.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3176 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-01-24 01:44:36 +00:00
hybrid 6e7c44fe95 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3174 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-01-23 20:13:43 +00:00
hybrid c4abef60fb Fix typo in typdefs
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3170 dfc29bdd-3216-0410-991c-e03cc46cb475
2010-01-23 15:30:04 +00:00
hybrid 05d2224f14 Fix null pointer access spotted by grafikrobot.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2906 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 17:20:43 +00:00
hybrid 540e65604f Fix compile problems with iPhone target and ogl-es extensions, as reported by grafikrobot.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2902 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 16:24:11 +00:00
hybrid 477103a05d Add more read back formats.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2897 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 13:21:33 +00:00
hybrid 16bbb4f8a2 Add mipmap lod support for ogl-es 1.x
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2896 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 13:03:04 +00:00
hybrid 82a43d2586 NPOT support for ogl-es 1.x
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2895 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 12:46:09 +00:00
hybrid 4f159dddfe Fix texture wrap changes in ogl-es driver. Update ogl-es extensions.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2894 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 12:30:26 +00:00
hybrid 2832a61dd2 Merged revisions 2781:2892 from trunk.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2893 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 10:08:00 +00:00
hybrid 944368eb36 IPhone device fixes by grafikrobot.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2822 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-09 17:14:47 +00:00
hybrid 459595d106 Add another define check for better recognition of IPhone targets, as suggested by FuzzYspo0N.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2788 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-03 17:05:06 +00:00
hybrid 0aa5845e59 Merged revisions 2695:2780 from trunk.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2781 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-02 17:20:21 +00:00
hybrid d1425bf264 Adapt IPhone device creation to new multi-device scheme.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2762 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-27 18:52:35 +00:00
hybrid 2eaf347997 Fix IPhone platform recognition and defines.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2761 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-27 13:30:51 +00:00
hybrid 9e66c132cc Add some more missing methods, mentioned by zillion42.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2757 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-27 09:22:06 +00:00
hybrid b30258d298 Fix missing endif.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2756 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-27 09:15:30 +00:00
hybrid 0126003ec8 First set of fixes to make ogl-es driver usable with latest Irrlicht API again.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2706 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-10-01 17:00:20 +00:00
hybrid 1584e0d569 Merged revisions 2441:2694 from trunk. This is a huge update which brings the ogl-es branch to the latest 1.6 state. No updates for the ogl-es driver have been incorporated, this branch might not even compile properly right now. I'm just very happy that the merge finally went through...
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2695 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-09-16 12:48:19 +00:00
hybrid 1236efd02d Remove extra namespace in iphone device.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2452 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-07-08 07:53:56 +00:00