minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-09-22 04:10:36 +02:00
Code Issues Projects Releases Wiki Activity

Drop ETS_TEXTURE_1

Browse Source 
The transformation state itself is still available via ETS_TEXTURE_0+1
This commit is contained in:
numzero 2023-03-06 13:58:38 +03:00
parent a6d062ebd9
commit 6de0afa8b3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/IVideoDriver.h
View File

@ -57,10 +57,8 @@ namespace video
//! Projection transformation //! Projection transformation
ETS_PROJECTION, ETS_PROJECTION,
//! Texture 0 transformation //! Texture 0 transformation
//! Use ETS_TEXTURE_0 + texture_number to access other texture transformations //! Use E_TRANSFORMATION_STATE(ETS_TEXTURE_0 + texture_number) to access other texture transformations
ETS_TEXTURE_0, ETS_TEXTURE_0,
//! Texture 1 transformation
ETS_TEXTURE_1,
//! Only used internally //! Only used internally
ETS_COUNT = ETS_TEXTURE_0 + MATERIAL_MAX_TEXTURES ETS_COUNT = ETS_TEXTURE_0 + MATERIAL_MAX_TEXTURES
}; };

4
source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
View File

@ -176,7 +176,7 @@ void COGLES2MaterialSolid2CB::OnSetConstants(IMaterialRendererServices* services
core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0); core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0);
services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16); services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16);
Matrix = driver->getTransform(ETS_TEXTURE_1); Matrix = driver->getTransform(E_TRANSFORMATION_STATE(ETS_TEXTURE_0 + 1));
services->setPixelShaderConstant(TMatrix1ID, Matrix.pointer(), 16); services->setPixelShaderConstant(TMatrix1ID, Matrix.pointer(), 16);
services->setPixelShaderConstant(TextureUsage0ID, &TextureUsage0, 1); services->setPixelShaderConstant(TextureUsage0ID, &TextureUsage0, 1);
@ -223,7 +223,7 @@ void COGLES2MaterialLightmapCB::OnSetConstants(IMaterialRendererServices* servic
core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0); core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0);
services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16); services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16);
Matrix = driver->getTransform(ETS_TEXTURE_1); Matrix = driver->getTransform(E_TRANSFORMATION_STATE(ETS_TEXTURE_0 + 1));
services->setPixelShaderConstant(TMatrix1ID, Matrix.pointer(), 16); services->setPixelShaderConstant(TMatrix1ID, Matrix.pointer(), 16);
services->setPixelShaderConstant(ModulateID, &Modulate, 1); services->setPixelShaderConstant(ModulateID, &Modulate, 1);