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

47 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 1e6c870ba2 Merging r5892 through r5916 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5917 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-03-09 15:46:26 +01:00
cutealien 6ee00a39fd Merging r5877 through r5891 from trunk to ogl-es branch 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5892 dfc29bdd-3216-0410-991c-e03cc46cb475
 2020-03-09 15:46:11 +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
cutealien 5a4274203b Merging r5623 through r5649 from trunk to ogl-es 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5650 dfc29bdd-3216-0410-991c-e03cc46cb475
 2018-10-29 21:25:43 +00:00
cutealien bdb412cd44 Merge revisions r5604 through r5621 from trunk to ogl-es. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5622 dfc29bdd-3216-0410-991c-e03cc46cb475
 2018-06-17 20:01:00 +00:00
cutealien 0fc5d21a40 Merge revision 5277:5282 from trunk to ogl-es. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5288 dfc29bdd-3216-0410-991c-e03cc46cb475
 2016-03-18 17:24:46 +00:00
nadro b371f08d4a - Merged rev 5258-5275 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5286 dfc29bdd-3216-0410-991c-e03cc46cb475
 2016-03-17 22:17:43 +00:00
nadro db0dac2f09 - Merged rev 5226-5244 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5246 dfc29bdd-3216-0410-991c-e03cc46cb475
 2016-01-17 13:08:20 +00:00
nadro 0cc2e6dc45 - Merged revision 5185-5190 from trunk. 
- Fixed cubemap texture support for OpenGL drivers.

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@5191 dfc29bdd-3216-0410-991c-e03cc46cb475
 2015-11-27 22:39:12 +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 b74d7c5ed5 Merge r4618-4629 from trunk. Branch has now catched up to trunk again :-) 
Fix memory access in d3dx mipmap generation. Thanks to hellflip for the hint.
Developer documentation - adding a release checklist.
Improve speed for finalizing skinned meshes (removal of unnecessary frames after loading) (thx @ichtyander for the testmodel)
Down from ~20 seconds to ~0,5 seconds :-)
Minor bugfix for my last check-in. dropBadKeys now finds some more broken frames.
Changing calling convention for static lib release fast CPU to Cdecl because FastCall did not actually compile (conflicts with pnglib). Also the same setting is used when compiling as dll, so I guess this setting was simply not tested. Thanks @AReich for reporting. See thread for more info:  http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=49462


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4651 dfc29bdd-3216-0410-991c-e03cc46cb475
 2014-01-08 00:09:09 +00:00
nadro 334cf13cd6 - Improved texture creation system (it avoid create a texture when image is missing or color format isn't supported). 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4532 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-05-27 17:16:52 +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
nadro 8fa1370e6d - Added bswap for 64 bits. 
- Improved and better unified OpenGL and OpenGL ES2 texture interface (support for compressed textures in OpenGL ES2).
- Added support for PVRTC and PVRTC2 compressed textures format.
- Minor improved in DDS loader.
- Initial support for PVR loader (currently with limited image formats support - PVRTC, PVRTC2, DXTn). This loader will improve soon.

IMPORTANT: This commit doesn't provide integration of PVR loader with iOS, MacOSX and some Windows IDEs project files.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4529 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-05-20 21:38:55 +00:00
hybrid aec5a3afae Merge from trunk, revisions 4495-4510. Mostly whitespace and indentation fixes; mipmap fixes 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4511 dfc29bdd-3216-0410-991c-e03cc46cb475
 2013-04-17 17:45:53 +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
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 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 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 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 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 b24d213745 Merged revisions 2375:2440 from trunk. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@2441 dfc29bdd-3216-0410-991c-e03cc46cb475
 2009-07-03 09:11:53 +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 30100db0a5 Merged all revisions up to 1976 from trunk into ogl-es branch. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1977 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-12-19 09:56:25 +00:00
hybrid cc7f977f60 Merged revisions 1726:1852 from trunk for the recent updates. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@1853 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-11-27 23:52:13 +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 f25d01b31b Allow read-only locking of textures, which may improve the performance due to optimized access to the data and skipped updates when unlocking. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1456 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-08-07 11:59:42 +00:00
hybrid 471219360d Minor tweaks in cleanup. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1422 dfc29bdd-3216-0410-991c-e03cc46cb475
 2008-07-25 16:52:43 +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
engineer_apple 1f349d836a - Burningvideo: repaired MipMap Selection 
- renamed private Driver function name getTextureSizeFromImageSize to
  getTextureSizeFromSurfaceSize ( now equal in all drivers )


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1143 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-12-30 16:51:28 +00:00
bitplane 0b391b0380 Added fix for d3d9 textures by rogerborg- D3D9 textures no longer hold on to the IImage pointer, a copy is already in system ram due to using the d3d_managed pool. The same change should also be added to D3D8 textures. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1122 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-12-21 21:20:34 +00:00
hybrid 6f7e2a34c7 Fix the const things for d3d drivers. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@962 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-09-16 10:44:05 +00:00
hybrid 08e359784b GUI constification done, other parts still missing. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@961 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-09-16 00:18:13 +00:00
hybrid 8f34efc3f4 Fixed the d3d9 mipmapping for new formats. Still not a nice solution, though. Also enabled hardware mipmap update for d3d9 with an extra check for format support. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@837 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-08-14 15:10:28 +00:00
hybrid f41e314fcc Fixed some missing unlocks and the missing point size setting in D3D drivers/textures. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@810 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-07-29 23:48:58 +00:00
hybrid b41385a3ff Mem leak fixed in d3d RTT code identified by vitek. Some redundant code removed and OpenGL shader materials fixed for changing number of textures. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@807 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-07-25 12:51:43 +00:00
hybrid 37d2363843 Temporarily disabled the non-alpha textures for d3d due to lack of mipmap support. Have to fix that first. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@802 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-07-19 23:57:14 +00:00
hybrid b9f96332bd Added a new texture creation flag for specifying the desired texture format. The new flag chooses a non-alpha channel texture format. This will save some texture memory (one fourth for 32bit textures). 
Fixed another COpenGL render state bug.
Fixed several color conversion methods.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@801 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-07-19 23:31:18 +00:00
hybrid f1ef8d2fc5 Reindentation and small updates. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@793 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-07-16 23:46:43 +00:00
hybrid 163d098040 Some minor changes. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@767 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-07-07 20:12:48 +00:00
hybrid ce27efa421 Fixed typos and mingw stuff. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@735 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-06-25 23:34:16 +00:00
hybrid 65a1407bd1 Some simplifications in d3d texture code. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@733 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-06-25 23:16:17 +00:00
hybrid 01fea0198a Pitch fix for d3d RTTs by alc. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@725 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-06-21 08:53:12 +00:00
hybrid 13b7691b7a Fixed correct overloading of hasMipMaps, found by Jiang. Also changed it to const. 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@648 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-05-22 07:20:16 +00:00
bitplane c00ce1d372 Moved everything to /trunk 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@643 dfc29bdd-3216-0410-991c-e03cc46cb475
 2007-05-20 18:03:49 +00:00