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 e3ea22106cde972e0bdc3f6d008a50ec0f722c93..b220e5e608eb9a1f32e04457db59b666cc1775d2 100644 (file)
--- a/include/IVideoDriver.h
+++ b/include/IVideoDriver.h
@@ -57,10 +57,8 @@ namespace video
                //! Projection transformation\r
                ETS_PROJECTION,\r
                //! Texture 0 transformation\r
-               //! Use ETS_TEXTURE_0 + texture_number to access other texture transformations\r
+               //! Use E_TRANSFORMATION_STATE(ETS_TEXTURE_0 + texture_number) to access other texture transformations\r
                ETS_TEXTURE_0,\r
-               //! Texture 1 transformation\r
-               ETS_TEXTURE_1,\r
                //! Only used internally\r
                ETS_COUNT = ETS_TEXTURE_0 + MATERIAL_MAX_TEXTURES\r
        };\r

diff --git a/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp b/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
index 5b275d3734c201fc6aad32be73bd147d276e0dec..899dfd9abb183a331c8188f0281d73c7a37576bc 100644 (file)
--- 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);\r
        services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16);\r
 \r
-       Matrix = driver->getTransform(ETS_TEXTURE_1);\r
+       Matrix = driver->getTransform(E_TRANSFORMATION_STATE(ETS_TEXTURE_0 + 1));\r
        services->setPixelShaderConstant(TMatrix1ID, Matrix.pointer(), 16);\r
 \r
        services->setPixelShaderConstant(TextureUsage0ID, &TextureUsage0, 1);\r
@@ -223,7 +223,7 @@ void COGLES2MaterialLightmapCB::OnSetConstants(IMaterialRendererServices* servic
        core::matrix4 Matrix = driver->getTransform(ETS_TEXTURE_0);\r
        services->setPixelShaderConstant(TMatrix0ID, Matrix.pointer(), 16);\r
 \r
-       Matrix = driver->getTransform(ETS_TEXTURE_1);\r
+       Matrix = driver->getTransform(E_TRANSFORMATION_STATE(ETS_TEXTURE_0 + 1));\r
        services->setPixelShaderConstant(TMatrix1ID, Matrix.pointer(), 16);\r
 \r
        services->setPixelShaderConstant(ModulateID, &Modulate, 1);\r