Commit Graph

893 Commits (0dae37726542fa6dfb3c1c9b13643a20a8f450e3)

Author SHA1 Message Date
hybrid 54fa54d446 More flexible driver choice
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3828 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-08 17:17:32 +00:00
hybrid 93e22a392c Add support for relaxing device configuration parameters in order to find a suitable surface and context.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3827 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-08 17:15:48 +00:00
hybrid 5e3cafcd42 Oops, typo fixed.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3815 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 09:16:34 +00:00
hybrid aff1c98d5f Update to latest extensions, just as for ogl-es2 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3814 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 09:13:26 +00:00
hybrid f8dccff6eb Fix extension support checks
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3813 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 09:12:25 +00:00
hybrid 33a01ddcb2 Fix comment and include order
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3812 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 09:04:09 +00:00
hybrid da5240400c Fix whitespaces and other layout things.
Change number of texture definition to use global define from irr_compile_config.h

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3811 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-07 08:56:52 +00:00
hybrid 15c0b9a462 Fix glBlendFunc reset after stencil rendering and other minor fixes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3807 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 17:13:30 +00:00
hybrid 72f5709ccc Fix alpha choice in one_texture_blend
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3806 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 17:12:03 +00:00
hybrid 00708f2578 Add ogles drivers to test
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3805 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 17:10:33 +00:00
hybrid d5b9d20e0e Pass high level shader files to ogl-es drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3804 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 15:01:38 +00:00
hybrid de1540ae9d Move matrix setup after program use, such that the program is effective at that point. 2d works again without problems.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3803 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 15:00:50 +00:00
hybrid 0f1f619fc6 Add support for int vectors in shaders.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3802 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-06 14:59:42 +00:00
hybrid 91127f56ac Avoid crash on non-existent textures
git-svn-id: svn://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 f88f0b3bff Fix mipmap generation and add support for manually specified mipmaps.
git-svn-id: svn://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 a1e026c89d 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: svn://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 1b7b5fa56e Fix and enable FBO usage.
git-svn-id: svn://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 7acc7ab127 Add support for some base driver features, e.g. texture lod, blendFunc, polygon offset.
git-svn-id: svn://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 44b271aedf Fix missing type also for ogl-es2
git-svn-id: svn://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 d26c553a5b 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: svn://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 cd70e1aa21 Add extension flag for ogl-es2 driver.
git-svn-id: svn://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 2bee30b221 Update to latest ogl-es extensions
git-svn-id: svn://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 2ae43947e6 FBOs does not work properly, so it's kept disabled in the driver.
git-svn-id: svn://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 635329e001 Add all supported features to the queryFeature set.
git-svn-id: svn://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 4c6d8859bf Enable fbo textures, which work without an extension in the ogl-es2 driver.
git-svn-id: svn://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 4f7240d361 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: svn://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 4be987433b Fix broken copy-paste result
git-svn-id: svn://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 04ded9b2d8 Update to latest powervr SDK, remove unused libs
git-svn-id: svn://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 88a8a5710b Fix 2dmaterial override as in ogl-es2 driver. Remove unused include of windows.h
git-svn-id: svn://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 46de5f022f Fix 2doverride variable which wrongly used the material instead of the enable flag.
git-svn-id: svn://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 974b1f87a9 Some more fixes, sent in by iamacooldude. Also some layout updates and minor cleanups.
git-svn-id: svn://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 0ba10edf6d Fix some problems with recent updates.
git-svn-id: svn://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 66b18c0847 Add Override2dMaterial support and draw2DImageBatch implementation for ogl-es drivers. The latter already exists in ogles2 driver.
git-svn-id: svn://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 e379658827 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes.
git-svn-id: svn://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 86a1f3f480 Fix compilation after recent API changes. Fix submitted by Rene Rivera
git-svn-id: svn://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 58d6c11fa0 Fix compilation problems due to last update. Fix vc10 project files
git-svn-id: svn://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 9b277bea38 Make shader path for ogles2 configurable via define.
git-svn-id: svn://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 de2e004b83 Merge from trunk, revisions 3370-3559. Huge update to catch up with Irrlicht 1.7.2+ and latest 1.8 developments.
git-svn-id: svn://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 7ac7c9cb9c Fix parameters in ogl2 extension handler, thanks to kine for the hint
git-svn-id: svn://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 4f6edf5e2e 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: svn://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 ab5739f571 Merged from trunk, revisions 3300-3365. Another large bugfix merge.
git-svn-id: svn://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 7bae34bc61 Merged revisions 3175-3300 from trunk. Another huge update, bringing the ogl-es branch to the latest version of Irrlicht.
git-svn-id: svn://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 253a79d605 Error message check added for egl setup.
Updated to latest OpenGL driver code to fix AntiAlias etc.

git-svn-id: svn://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 6afbf25467 Make project compilable again. Not all new things ported from OpenGL, yet.
git-svn-id: svn://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 d07fc00916 Merged revisions 2897:3173 from trunk. Huge update with uncountable fixes, additions, etc.
git-svn-id: svn://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 bd615dca68 Fix typo in typdefs
git-svn-id: svn://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 f9cee8b42d Fix null pointer access spotted by grafikrobot.
git-svn-id: svn://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 659e3aecec Fix compile problems with iPhone target and ogl-es extensions, as reported by grafikrobot.
git-svn-id: svn://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 e16e777479 Add more read back formats.
git-svn-id: svn://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 add7eee4f6 Add mipmap lod support for ogl-es 1.x
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2896 dfc29bdd-3216-0410-991c-e03cc46cb475
2009-11-20 13:03:04 +00:00