Commit Graph

111 Commits (990d475fbbb2653c95b992937906eb49960d02fb)

Author SHA1 Message Date
cutealien 990d475fbb Merging r5686 through r5778 from trunk to ogl-es branch (part 2)
(was in wrong folder in last commit, so only source folder got checked in).
Also adapt ES1 and ES2 driver to remove texture from OGL texture cache
(that was fixed in GL driver in the parts that got merged).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5780 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-02-27 20:30:26 +00:00
cutealien ac376727d0 Merging r5678 from trunk to ogl-es branch
- Add global variable MATERIAL_MAX_TEXTURES_USED for texture limit
- COpenGLCoreFeature::TextureUnit renamed to COpenGLCoreFeature::MaxTextureUnits
Drivers for ES1, ES2 and WebGL also adapted.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5685 dfc29bdd-3216-0410-991c-e03cc46cb475
2019-01-17 23:11:18 +00: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 248526d9d5 Apply fix from r5595 to correct LastMaterial in OpenGLDriver to the OGL ES drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5598 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-12-31 20:51:50 +00:00
cutealien 54ba627a72 Separate es2 and WebGL extension handlers. Should allow to get RTT's with depht buffers > 16bit to work.
While names of WebGL extensions are 90% identical to ES2, at some point the WebGL committee seems to have decided 
that it's better to give new names to the same stuff (RTT's with depth-buffer for example, but I'm sure they had a good reason?).
So we have to split this and now have mostly independent extension handlers. Still - WebGLDriver is lazy and derives from 
ES2Driver and that derives from ES2ExtensionHandler... so unfortunately WebGL driver has now 2 extension handlers.
The way it's solved for now is that extension strings are handled by the webgl extension handler and everything else
stays for now with the ES2ExtensionHandler. Maybe we can split/merge stuff later in a better way, but I see no easy to implement improvement.
Could be we could pass extension handlers as template paramter to drivers maybe, but that's just an idea for now.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5556 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-10-27 16:48:00 +00:00
cutealien b5d46535e7 Remove warnings in ES1 and ES2 getColorFormatParameters functions as was done in OpenGL before.
(warnings are now produced instead of places calling those functions).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5540 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-30 13:27:27 +00:00
cutealien 62ac2fd2e1 Implement queryTextureFormat for es1 and es2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5525 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-21 14:34:56 +00:00
cutealien 20418b3126 Unify GLES extension handling.
Update ES extensions (first 290 now recognized)
Get examples 2 to compile in c::b (most other examples still need to fix linker settings)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5521 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-08-18 13:28:20 +00:00
cutealien 380d186d3f Rolled back to r5490. Was likely a misunderstanding
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5492 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-03 16:37:29 +00:00
cutealien 3a2a0eede9 Remove getZBufferBits from ogl-es drivers.
It's never used. Also if I guess the intended use for it correctly (figuring out internFormat to use for depth-buffer textures)
then there will be a problem with that implementation as it only works for OpenGL that way (maybe also ES1.0, not sure there, but for ES2.0 it looks wrong).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5491 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-07-03 16:08:44 +00:00
cutealien 7766187be4 Use new zbuffer-test (which was already in OpenGL) in OGL-ES1 and OGL-ES2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5477 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-08 13:11:46 +00:00
cutealien c3ed02c8d0 setRenderStates3DMode in ES1 and ES2 now use setBlendFunc with (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) instead of (GL_ONE, GL_ONE_MINUS_SRC_COLOR).
This prevents color blending with background when we only want alpha blending (when EBO_ADD is set in materials).
It's something that was changed a few years ago in the OpenGL driver, but never made it into the ES drivers.
Note that transparency in ES1 _is_ currently broken - but it was broken before this patch already (so another bug to hunt).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5473 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-06-07 10:21:30 +00:00
cutealien b46adf170d Add line numbers to gl errors in es1 and es2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5462 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-05-25 14:57:27 +00:00
cutealien 4a5eaeb45d Add support for (experimental) WebGL1 driver for emscripten (still work in process).
It's a reduced OGLES2 driver which tries to work only with bound buffers.
This allows emsripten to compile without "-s FULL_ES2=1" (the WebGL simulation) 
which is a lot faster. Driver can already run simply examples, but is not yet complete.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5441 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-19 17:30:37 +00:00
cutealien 3ac8d2649a ogles1 and ogles2 drivers now support meshbuffers with other primitives than just triangles.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5432 dfc29bdd-3216-0410-991c-e03cc46cb475
2017-04-18 12:30:57 +00:00
cutealien d71de62995 Fix missing case in COGLES1Driver::getColorFormatParameters.
Thanks @ cheqnk for report and patch.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5296 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-04-22 08:34:24 +00:00
cutealien d16f529f18 Fix compiling (part 1 - still has some library troubles)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5290 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-03-18 17:36:56 +00:00
nadro 9773157768 - Fixed issue with CurrentRenderTargetSize vs. CurrentRendertargetSize in OpenGL ES drivers. Thanks cheqnk for report.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5257 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-02-13 11:13:44 +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 27bf238aa5 - Fixed texture rendering in both OpenGL ES1 and ES2 drivers on iOS.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5234 dfc29bdd-3216-0410-991c-e03cc46cb475
2016-01-03 18:39:39 +00:00
nadro bf3273cb5f - Merged rev 5222-5223 from trunk.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5224 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-17 19:48:24 +00:00
nadro 0200408475 - Fixed issue with depth color formats in OpenGL drivers (example no. 13 works properly at now).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5221 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-17 12:44:24 +00:00
nadro e6fe1abc16 - Fixed texture rendering issues in OpenGL ES drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5217 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-14 22:51:01 +00:00
nadro 3fbea082cc - Fixed compilation issues on iOS.
- Rewrote from scratch class related to iOS device (Application delegate is hidden inside Irrlicht -> events will be exposed outside in upcoming commit).
- Added iOS example (at now example structure for iOS looks the same like for the other platforms - without application delegate).
- Integrated iOS projects with existing XCode projects.
- Added external context manager with support for EAGL.
- Removed *.xib dependencies from iOS project.
- Added missing _IRR_OVERRIDE_ for some methods.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5213 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-13 19:13:45 +00:00
nadro a660cd1d38 - Fixed compilation issues on Android.
- Fixed compilation issues when OpenGL ES1 driver is enabled. (there are still rendering issues related to multitexturing visible in a few examples).

Following features are still unavailable in ogl-es branch since rev 5181:
* Support for iOS
(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@5204 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-12-06 19:56:33 +00:00
cutealien 58fa0cf341 One of the COGLESDriver draw2DImage renamed to draw2DImageBatch as in other drivers. Thx @feelthat for reporting.
Added _IRR_OVERRIDE macros to both GLES drivers and fixed one more overload where it had gone wrong.
Enabled c++11 compiling on in c::b project files on Linux to find those kind of troubles faster.



git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5122 dfc29bdd-3216-0410-991c-e03cc46cb475
2015-08-29 12:43:09 +00:00
cutealien 7ac215ee11 Just some cleanup (spelling, double breaks, Irrlicht variable style, static-cast instead of c-casts, fix intialize re-order warnings)
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4976 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-16 14:35:26 +00:00
nadro d50be349ca Fixed issue with ECFN_DISABLED state in OGL ES and ES2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4965 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-10-11 09:37:30 +00:00
cutealien 0e9e909bed Add IVideoDriver::getAmbientLight function so shader callbacks can access global ambient light easier.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4941 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-24 23:51:06 +00:00
nadro 61581047fa Added OGLES1 support for FB device.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4920 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-09-12 18:38:11 +00:00
nadro 86cc2a9556 - Added stencil shadow support for OpenGL ES1 driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4906 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-07-23 19:08:16 +00:00
nadro 6c8e9ec729 - Fixed issue with BlendFactor in OpenGL ES1 and ES2 drivers.
- Added missing from the last merge EVDF check.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4884 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-26 16:40:42 +00:00
nadro 02b07f10f2 - Removed glGetError calls from release builds.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4881 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-25 15:43:33 +00:00
nadro a3c24d3a51 - Fixed issue with color mask in both OpenGL ES1 and ES2 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4880 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-25 15:34:18 +00:00
nadro bd088a6dc2 - Added texture stage cache to both OpenGL ES1 and ES2 drivers.
- Fixed FBO issues in both OpenGL ES1 and ES2 drivers.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4876 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-22 17:07:49 +00:00
cutealien 661a19338e Get rid of a few compile warnings.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4871 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-15 11:42:49 +00:00
cutealien 17d33b9b99 Change error output. Add some debug-info. Some whitespace changes.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4870 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-15 10:13:14 +00:00
nadro 03fceb34d3 - Added separate blending support to both OpenGL ES1.x and 2.0 drivers.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4861 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-10 21:47:14 +00:00
cutealien 7ffac2cad5 Fix compiling of COGLESDriver and COGLES2Driver (got broken when the isTransparent stuff got merged).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4844 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-05-08 16:23:12 +00:00
nadro 4e5ead4268 Fixed OSX and iOS compilation issues (for C++11 also).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4688 dfc29bdd-3216-0410-991c-e03cc46cb475
2014-02-13 21:09:38 +00:00
hybrid f149e69b9c Reindent.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4614 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-19 23:09:06 +00:00
hybrid 2d4193888e Improvements of the context manager in order to prepare context switching.
Implement WGL context manager
OGLES2 driver was not yet working again, might be a different problem, though. Andoird device was not tested.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4605 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-11-13 23:20:30 +00:00
hybrid 53c6cfdf56 Fixed OGL-ES2 for win32 as well. Not yet properly running with my emulator, though. So setup might still be incomplete here.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4597 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-26 12:13:26 +00:00
hybrid 8d647c930e Abstract away the EGLManager into IContextManager and add the manager for win32/ogles1 as well.
Android device should still compile and work, but was not tested.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4596 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-26 00:02:19 +00:00
hybrid 7afc23819b Should compile under Windows again
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4595 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-25 16:08:45 +00:00
nadro fffdc650bb git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4591 dfc29bdd-3216-0410-991c-e03cc46cb475 2013-10-20 20:38:20 +00:00
nadro 0395fc3648 - Clean-up Android device source file.
- Improved multi-touch support on Android.
- Fixed problem with context lost on Android when application was resumed.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4590 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-17 23:11:56 +00:00
nadro 5987dfc654 - Exclude EGL code from OpenGL ES driver files. This is first step for improve Android device support.
WARNING: This commit is pushed out only for development reason. It may break temporary devices other than Android. Android device improve process will be completed in next 1-3 commits.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4588 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-10-17 06:50:30 +00:00
nadro 9c2f45c738 Fixed compilation issues in OGL ES driver.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4568 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-08-03 15:59:18 +00:00
nadro e3fa638cdf - Fixed problem with application crash when texture was removed and material override for 2d rendering was enabled.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4567 dfc29bdd-3216-0410-991c-e03cc46cb475
2013-08-02 23:20:06 +00:00