MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,333 Commits
2 Branches
0 Tags
38 MiB
Commit Graph

59 Commits (ced66e610c6c740f1388e8205bfb3c48fcf22794)

Author SHA1 Message Date
cutealien ced66e610c Merging r6196 through r6248 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6249 dfc29bdd-3216-0410-991c-e03cc46cb475
 2021-08-30 23:04:14 +02:00
cutealien c17023f55c Merging r6128 through r6139 from trunk to ogl-es branch. 
Note: I could not merge 2 OSX project files as I'm not sure how to correctly resolve their conflicts.
Maybe old version for those files are still OK, as ogl-es branch got updated once before (leaving trunk behind).
In case it causes problems I hope someone can send another patch for those 2 files:
source/Irrlicht/Irrlicht.xcodeproj/xcshareddata/xcschemes
source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6140 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-10-01 19:58:50 +02:00
cutealien 28ff778a05 Merging r6122 through r6127 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6128 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-21 11:51:54 +02:00
cutealien b57b47b725 Merging r6117 through r6119 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6120 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-14 11:34:02 +02:00
cutealien 195d12f57b Merging r6073 through r6074 from trunk to ogl-es branch. 
The support for UINT shader constants added in this is just returning warnings in GLES drivers as this would need ES 3.0


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6115 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-12 15:42:43 +02:00
cutealien 967bc1ecee Merging r6039 through r6072 from trunk to ogl-es branch. 
Note: Not yet caught up with trunk.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6114 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-06-12 15:42:43 +02:00
cutealien 4d9c660504 Merging r5812 through r5842 from trunk to ogl-es branch 
Also added some comments to gl-es drivers about missing polygon offset code.
The merges had some changes for that in the OpenGL driver, but both es drivers have no code at all about this.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5889 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-03-09 15:45:40 +01:00
cutealien 252abab03d Merging r5652 through r5663 from trunk to ogl-es. 
This is mostly about cubemap changes. ES drivers compile, but not tested
if cubemaps work with them.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5664 dfc29bdd-3216-0410-991c-e03cc46cb475
 2018-11-25 15:44:47 +00:00
nadro 216af56b04 - Merged rev 5247 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5248 dfc29bdd-3216-0410-991c-e03cc46cb475
 2016-01-17 13:38:01 +00:00
nadro 58cba0b3c6 - Merged revision 5195-5197 from trunk. 
Following features are still unavailable in ogl-es branch since rev 5181:
* OpenGL ES1
* Support for iOS
* Support for OSX
(If you need one of those features please use rev 5180)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5198 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-11-28 23:18:00 +00:00
nadro ce6b7562ce Merge revision 4977:5180 from trunk to ogl-es. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5181 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-11-12 22:32:01 +00:00
cutealien 03b231db76 Merge revision 4782:4785 from trunk to ogl-es: 
- Minor improvements in D3D8/D3D9 blend operation mechanism.
- Prepared OpenGL methods related to separate blending for use.
- Minor fixes in blend operation mechanism.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4840 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-05-08 15:59:15 +00:00
nadro bce0ada646 - Added support for GLX manager (Hybrid is author of this patch, I just tested it). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4668 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-16 01:13:35 +00:00
cutealien d87aec8a3b Merge r4616-4617 from trunk: 
Merged updates from 1.8.1 release to trunk, revisions 4579-4615.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4650 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-08 00:00:33 +00:00
cutealien d757b9d75c Merge r4600 from trunk: 
Update to OpenGL 4.4 headers


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4648 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-07 23:51:18 +00:00
cutealien 89a17996f3 Merge r4572-4578 from trunk: 
Add intersect method to create intersect box, provided by hendu
Fix order problem and missing deletes in OpenGL extension strings.
Reverting my changes from r4569 as they also break stuff by now. Will continue the discussion in http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=48940
Reverted changes related to CallBack->OnSetMaterial call.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4645 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-07 23:29:30 +00:00
cutealien 2ee8d1ccd3 Merge r4571 from trunk: 
Update to latest glext headers, add new extension strings, fix one order bug
NOTE: Latest glext headers had already been in this branch, so only other patches applied.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4644 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-07 23:23:29 +00:00
nadro 370222b927 - Improved compressed texture system handling (it avoid code duplicate between all drivers). 
- Added ETC1 and ETC2 compressed textures support via PVR loader. (This feature require tests on platform which support ETC1 and ETC2 formats).

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4530 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-05-26 17:54:36 +00:00
hybrid 0753afac9d Merged from trunk revisions 4185-4487. Huge update to latest 1.8 updates. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4488 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-03-28 17:04:07 +00:00
nadro 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
hybrid 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
hybrid 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
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 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 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 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 329f550b17 Merged revisions 2781:2892 from trunk. 
git-svn-id: svn://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 72e83023ec 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: svn://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 75b5403b5b Merged from trunk revisions 2144:2363 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2364 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-05-05 00:09:53 +00:00
hybrid 55e2c6d600 Merged from trunk, all revisions from 1977 to 2143. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2144 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-01-27 13:23:36 +00:00
hybrid 51484af6d3 Merge rev. 1524:1721 from trunk in order to get latest initialisation code and feature support for ogl-es driver. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1722 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-12 10:11:25 +00:00
hybrid 07518fba46 New glext.h and glxext.h including support in ExtensionHandler for OpenGL 3.0 additions. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1502 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-08-18 15:17:03 +00:00
hybrid 8ac1ffd74e New glext.h. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1473 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-08-08 12:00:59 +00:00
hybrid d3491565ed Added RTT locking for OpenGL driver. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1455 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-08-07 11:36:56 +00:00
hybrid c661079e7e FBO patch from Nadro for better ATI support. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1402 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-06-27 15:38:48 +00:00
hybrid 97577f9bc2 Push creation parameters to video drivers. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1378 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-06-13 14:59:28 +00:00
hybrid cdffc4a5d6 Merge from branch 1.4, revisions 1344:1352, which are the doc updates from the 1.4.1 release. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1353 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-05-22 11:51:37 +00:00
hybrid 755e117078 Merged from 1.4 branch revisions 1316:1328. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1329 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-04-29 11:34:54 +00:00
hybrid e7add51880 Merged from 1.4 branch revisions 1272:1279 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1280 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-03-05 00:02:00 +00:00
hybrid 07670acf7e Merged 1134:1151 from branch 1.4 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1152 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-04 11:10:37 +00:00
engineer_apple 24334f193c added Initial Windows Mobile 6 Version. 
- Windows Mobile 6 SDK
- Visual Studio 2005 only
Minor:
- Burningvideo: MipMap Selection repaired
- renamed private Driver function getTextureSizeFromImageSize to
  getTextureSizeFromSurfaceSize


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1146 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-01-02 10:28:12 +00:00
hybrid f6f335af7f Some reindentation, minor bugfixes, removed unused members from ExtensionHandler. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1100 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-12-06 00:00:23 +00:00
hybrid a691540444 Replace another redundant variable. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1078 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-12-02 22:35:42 +00:00
hybrid 8d4304f93f Maybe final fix for VBO extension methods... 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1063 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-11-19 07:22:07 +00:00
hybrid dd3ce1b8bb Fixed some missing returns in OpenGL driver. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1061 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-11-18 23:31:25 +00:00
lukeph 1e51dbcbe4 added some VBO (vertex buffer object) extensions to the openGL driver. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1059 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-11-18 10:52:06 +00:00
hybrid 00d8624a31 Fixed 1bit bitmap conversion. Removed unnecessary ifdefs. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@994 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-09-21 16:20:37 +00:00
hybrid c25f29a5f8 Properly fixed the OpenGL extension search. Also removed the glu part in order to get rid of glu at all. 
Added a Linux keyboard fix posted by denton. Now, Linux also sends just KeyPressed for Autorepeat, instead of alternating KeyReleased-KeyPressed.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@882 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-08-30 08:26:20 +00:00
hybrid b5270f9da4 Changed the OpenGL header include scheme for OSX. I hope that it does not break anything as I cannot compile it under OSX. Also some indentation for the OSX stuff. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@865 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-08-28 13:39:23 +00:00
hybrid 9d137cc70e Changed some OpenGL material renderer states. Removed the automatic mipmap generation after texture unlock for OpenGL to get the same as for d3d drivers. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@855 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-08-21 17:19:17 +00:00