Commit Graph

23 Commits

Author SHA1 Message Date
cutealien
23ebdbe978 Merging r6468 through r6476 from trunk to ogl-es branch
Note: Not yet using latest changes to IMaterialRendererServices in ES2 driver


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6477 dfc29bdd-3216-0410-991c-e03cc46cb475
2023-04-27 19:51:22 +00:00
cutealien
621bad3111 Merging r6426 through r6466 from trunk to ogl-es branch
Note: Updated IShaderConstantSetCallBack not yet supported by ogl-es drivers


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6467 dfc29bdd-3216-0410-991c-e03cc46cb475
2023-04-22 21:50:32 +00:00
cutealien
07f17647d2 Merging r6405 through r6424 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6425 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-09-22 21:55:03 +00:00
cutealien
ddc14ea87e Merging r6383 through r6403 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6404 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-15 16:02:08 +00:00
cutealien
67a488fc5c Merging r6364 through r6379 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6380 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-04 21:38:12 +00:00
cutealien
993f990036 Merging r6337 through r6363 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6379 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-05-04 21:26:18 +00:00
cutealien
2d63fdba3d Merging r6288 through r6336 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6337 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-04-15 18:51:09 +00:00
cutealien
67469c8899 Merging r6275 through r6286 from trunk to ogl-es branch
- Fixing warnings
- Updating bzip2 and zlib libraries


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6287 dfc29bdd-3216-0410-991c-e03cc46cb475
2022-01-07 16:30:25 +00:00
cutealien
6d96663c9a Merging r6256 through r6273 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6274 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-12-12 14:06:53 +00:00
cutealien
1efc93d766 Merging r6256 from trunk to ogl-es branch
(fixing OSX again)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6257 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-08-27 19:20:42 +00:00
cutealien
21302d038a 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-26 21:57:27 +00:00
cutealien
3a54e8d6b8 Merging r6186 through r6192 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6193 dfc29bdd-3216-0410-991c-e03cc46cb475
2021-02-21 16:37:56 +00:00
cutealien
f1a58b706c Fix bug introduced in last merge from svn trunk
struct STouchInput was in there twice.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6183 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-30 19:08:13 +00:00
cutealien
d07057959e Fix compiling last commit (missing a letter).
Thx @Maksym Hamarnyk


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6182 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-30 18:59:39 +00:00
cutealien
9274951a08 Enable _IRR_COMPILE_WITH_OGLES1_ on IOS.
Should be enabled according to Maksym Hamarnyk


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6181 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-30 18:50:50 +00:00
cutealien
a9f7c2abc9 Merging r6173 through r6179 from trunk to ogl-es branch
- Adding optional support for touch input in X11


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6180 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-30 18:39:20 +00:00
cutealien
124cc0be1e Make it possible again to enable ES1 on Linux.
Seems Debian 11 adds it back.
Thanks @TheBrokenRail for patch.
Hidden in comments for patch #322: https://sourceforge.net/p/irrlicht/patches/322


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6175 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-22 21:14:45 +00:00
cutealien
fa0b1cb509 Merging r6145 through r6171 from trunk to ogl-es branch
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6172 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-12-19 15:03:11 +00:00
cutealien
8b9947f9f6 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-09-29 20:22:28 +00:00
cutealien
562c0fb6f1 Merging r6107 through r6116 from trunk to ogl-es branch
Caught up with trunk again.
Not yet tested beside compiling (quick test failed, but seems like nothing from the new changes).


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6117 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-06-12 20:47:40 +00:00
cutealien
084e0e669a 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-11 20:27:29 +00:00
cutealien
cb62c685de 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-10 22:19:09 +00:00
cutealien
2ae2a551a6 Merging r5975 through r6036 from trunk to ogl-es branch.
GLES drivers adapted, but only did make compile-tests.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475
2020-01-03 19:05:16 +00:00