From: numzero <numzer0@yandex.ru>
Date: Mon, 6 Mar 2023 10:58:38 +0000 (+0300)
Subject: Drop ETS_TEXTURE_1
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=6de0afa8b3b6304b080798024bac41cdc668e823;p=irrlicht.git

Drop ETS_TEXTURE_1

The transformation state itself is still available via ETS_TEXTURE_0+1
---

diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h
index e3ea221..b220e5e 100644
--- a/include/IVideoDriver.h
+++ b/include/IVideoDriver.h
@@ -57,10 +57,8 @@ namespace video
 		//! Projection transformation
 		ETS_PROJECTION,
 		//! 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,
-		//! Texture 1 transformation
-		ETS_TEXTURE_1,
 		//! Only used internally
 		ETS_COUNT = ETS_TEXTURE_0 + MATERIAL_MAX_TEXTURES
 	};
diff --git a/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp b/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
index 5b275d3..899dfd9 100644
--- a/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
+++ b/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
@@ -176,7 +176,7 @@ void COGLES2MaterialSolid2CB::OnSetConstants(IMaterialRendererServices* services
 	core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0);
 	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(TextureUsage0ID, &TextureUsage0, 1);
@@ -223,7 +223,7 @@ void COGLES2MaterialLightmapCB::OnSetConstants(IMaterialRendererServices* servic
 	core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0);
 	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(ModulateID, &Modulate, 1);