freeminer/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
857 Commits 1 Branch 0 Tags
Commit Graph

857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
hybrid
922936fff9 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: http://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
95f84d02d3 Add extension flag for ogl-es2 driver. 
git-svn-id: http://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
41ceab2912 Update to latest ogl-es extensions 
git-svn-id: http://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
c102e36f20 FBOs does not work properly, so it's kept disabled in the driver. 
git-svn-id: http://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
ccfed65463 Add all supported features to the queryFeature set. 
git-svn-id: http://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
5de03d4887 Enable fbo textures, which work without an extension in the ogl-es2 driver. 
git-svn-id: http://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
f260d63c19 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: http://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
9da039ec29 Fix broken copy-paste result 
git-svn-id: http://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
1c6230c4a1 Update to latest powervr SDK, remove unused libs 
git-svn-id: http://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
1a6a61605d Fix 2dmaterial override as in ogl-es2 driver. Remove unused include of windows.h 
git-svn-id: http://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
3c385a3f58 Fix 2doverride variable which wrongly used the material instead of the enable flag. 
git-svn-id: http://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
053ea1c177 Some more fixes, sent in by iamacooldude. Also some layout updates and minor cleanups. 
git-svn-id: http://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
83fa4c7d81 Fix some problems with recent updates. 
git-svn-id: http://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
3e5ac71889 Add Override2dMaterial support and draw2DImageBatch implementation for ogl-es drivers. The latter already exists in ogles2 driver. 
git-svn-id: http://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
40f2be1ce5 Merge from trunk, revisions up to 3726. Another major update to latest 1.8 changes. 
git-svn-id: http://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
1a332f05f6 Fix compilation after recent API changes. Fix submitted by Rene Rivera 
git-svn-id: http://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
e12163dac4 Fix compilation problems due to last update. Fix vc10 project files 
git-svn-id: http://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@3562 dfc29bdd-3216-0410-991c-e03cc46cb475
 2011-01-17 08:37:00 +00:00