6fc41cf8c0
- Minor improvements is OpenGL ES driver.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4243 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 18:24:34 +00:00
dbc2c053ed
- Fixed OpenGL ES 2.0 compilation issues.
...
- Added OpenGL ES 2.0 support for iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4242 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 01:18:54 +00:00
f4f8fc5b49
Add ogl-es drivers to driver choice
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4241 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-12 08:58:42 +00:00
38189b9d55
Fix compile error due to name change of method
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4240 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-12 08:12:24 +00:00
e49efc5498
- Updated ogl-es branch to rev4182.
...
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4184 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-11 22:43:38 +00:00
2c9a184fb6
Fix wrong qualification in header, found by DaHuntha
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4073 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-02-11 23:08:26 +00:00
15c3dc795a
Merge from trunk, revisions 3910-3943. Also added the two missing new files from former merges. Seems that a broken and not properly cleaned merge broke the adding. Files were merged correctly, though, into the local directory. Other changes were updates of the support libs and several bug fixes and optimizations.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:48:26 +00:00
5caf2b4045
Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-08 22:15:27 +00:00
7687813257
Fix extension initialization in ogles1 driver.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3845 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-10 12:56:59 +00:00
d7f53dadf7
Remove opengl32.lib from project, it's linked via pragma
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3843 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 23:22:11 +00:00
8a0144ae8d
Add driver attrributes for ogles2.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3839 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 16:19:22 +00:00
ed4b37f8bc
Add drawPixel for ogles1
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3838 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:56:17 +00:00
847c8c2922
Add driver attributes for ogles1
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3837 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:53:26 +00:00
372ce58cbf
Add draw pixel method
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3836 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:52:15 +00:00
edf7ddbe43
Name of ogl-es 1 driver is different...
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3835 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:51:16 +00:00
6ff10b391e
Add bool return values on shader creation in order to signal problems and avoid illegal mem access on broken shaders.
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3834 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 13:12:48 +00:00
b48ed15144
Add checks for OGLES when testing for driver names in test utils
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3833 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 08:48:46 +00:00
095bc0d9d9
Adjust to new screenshot API
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3832 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 08:47:45 +00:00
7ae68647e9
Next large merge from trunk, revisions 3729-3830
...
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 07:08:47 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
nadro
hybrid