Commit Graph

974 Commits (9c967484f4c29bd2aa84b38b222b4330623133a3)

Author SHA1 Message Date
nadro ead98e883b - Added support for retina displays.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4338 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-23 01:03:27 +00:00
hybrid 567ca21735 Fix uniform warning output.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4332 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-18 16:12:20 +00:00
hybrid 9727f231c0 Update ogl-es extension headers to latest versions.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4331 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-10-18 11:45:34 +00:00
Nadro 36dcecf3df - Fixed compilation issues on platforms other than Android.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4311 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-09-16 22:20:18 +00:00
Nadro 3263c04acb - Added initial support for Android OS with example no. 8. Thanks for a gsfare and hiker for their hard work for this commit.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4309 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-09-06 23:14:12 +00:00
hybrid 1327dd70d8 Oops, another typo, missing close brace
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4250 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-19 12:27:34 +00:00
hybrid 0dab3450df Fix primitive render calls, which could happen to contain less vertices and indices than stated by the parameters. Now the calculation is based on the actually transferred number of elements.
Not sure why, but the draw2DImageBatch in ogl-es2 driver seemed to lack index calculation completely. I've added this now, should be required.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4249 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-19 11:31:32 +00:00
hybrid ad17a5f2de Fix textureBlend function rename, which seems to have not been propagated from trunk.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4248 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-16 14:55:50 +00:00
hybrid 1a2c064828 Fix typo from last update (missing curly brace).
Fix whitespaces

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4247 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-16 14:53:07 +00:00
nadro 548cacec9a - Fixed bugs related to OpenGL ES 1.x and 2.x in Linux and Win32 devices.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4246 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-14 12:42:09 +00:00
nadro f51b9618d9 - Fixed many issues with OGL ES 2.0 driver under iOS.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4245 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 23:16:59 +00:00
nadro 53ef330090 - Improvement OGL ES 2.0 support in iOS.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4244 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 18:25:59 +00:00
nadro 432e77d679 - Minor improvements is OpenGL ES driver.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4243 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 18:24:34 +00:00
nadro 2bf42923ee - Fixed OpenGL ES 2.0 compilation issues.
- Added OpenGL ES 2.0 support for iOS.

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4242 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-13 01:18:54 +00:00
hybrid 56454a3f6e Add ogl-es drivers to driver choice
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4241 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-12 08:58:42 +00:00
hybrid 0e2eff1d49 Fix compile error due to name change of method
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4240 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-07-12 08:12:24 +00:00
nadro 42660d13aa - Updated ogl-es branch to rev4182.
- Added iOS project
- Added mutli touch support (thanks to Redshift Software).

git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4184 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-06-11 22:43:38 +00:00
hybrid 2d058c8fd3 Fix wrong qualification in header, found by DaHuntha
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4073 dfc29bdd-3216-0410-991c-e03cc46cb475
2012-02-11 23:08:26 +00:00
hybrid 05d081f620 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: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3944 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-10-16 10:48:26 +00:00
hybrid 40fd2fc874 Merge from trunk, revisions 3831-3909. All fixes and additions from the last three month.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3910 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-09-08 22:15:27 +00:00
hybrid 8c3a921399 Fix extension initialization in ogles1 driver.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3845 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-10 12:56:59 +00:00
hybrid 47da0549d1 Remove opengl32.lib from project, it's linked via pragma
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3843 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 23:22:11 +00:00
hybrid a28aed20a2 Add driver attrributes for ogles2.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3839 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 16:19:22 +00:00
hybrid 5f5fa89772 Add drawPixel for ogles1
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3838 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:56:17 +00:00
hybrid 69d2b86f72 Add driver attributes for ogles1
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3837 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:53:26 +00:00
hybrid 9312e70ef8 Add draw pixel method
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3836 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:52:15 +00:00
hybrid fe55d5edec Name of ogl-es 1 driver is different...
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3835 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 14:51:16 +00:00
hybrid 0795f00099 Add bool return values on shader creation in order to signal problems and avoid illegal mem access on broken shaders.
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3834 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 13:12:48 +00:00
hybrid 0f933c27a9 Add checks for OGLES when testing for driver names in test utils
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3833 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 08:48:46 +00:00
hybrid b996624105 Adjust to new screenshot API
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3832 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 08:47:45 +00:00
hybrid 5a8bfaa8d9 Next large merge from trunk, revisions 3729-3830
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3831 dfc29bdd-3216-0410-991c-e03cc46cb475
2011-06-09 07:08:47 +00:00
hybrid 0fa01ea22c More flexible driver choice
git-svn-id: http://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 cfc08e52a7 Add support for relaxing device configuration parameters in order to find a suitable surface and context.
git-svn-id: http://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 9672fce4d3 Oops, typo fixed.
git-svn-id: http://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 1905ce7132 Update to latest extensions, just as for ogl-es2 driver.
git-svn-id: http://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 7d1dd93e45 Fix extension support checks
git-svn-id: http://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 f5a4696f78 Fix comment and include order
git-svn-id: http://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 33faf9b058 Fix whitespaces and other layout things.
Change number of texture definition to use global define from irr_compile_config.h

git-svn-id: http://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 9fb95f9009 Fix glBlendFunc reset after stencil rendering and other minor fixes.
git-svn-id: http://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 558b56fc30 Fix alpha choice in one_texture_blend
git-svn-id: http://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 88dceee886 Add ogles drivers to test
git-svn-id: http://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 52db69aeed Pass high level shader files to ogl-es drivers.
git-svn-id: http://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 b69ab963cd Move matrix setup after program use, such that the program is effective at that point. 2d works again without problems.
git-svn-id: http://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 36ee723141 Add support for int vectors in shaders.
git-svn-id: http://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 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