Skip to content

Commit cfc8e44

Browse files
RealBadAngelest31
authored andcommittedFeb 14, 2016
Use proper variable types for uniform sampler layers
1 parent c17c40a commit cfc8e44

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed
 

‎src/game.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -907,15 +907,18 @@ class GameGlobalShaderConstantSetter : public IShaderConstantSetter
907907
services->setPixelShaderConstant("yawVec", (irr::f32 *)&minimap_yaw_vec, 3);
908908

909909
// Uniform sampler layers
910-
int layer0 = 0;
911-
int layer1 = 1;
912-
int layer2 = 2;
913910
// before 1.8 there isn't a "integer interface", only float
914911
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
912+
f32 layer0 = 0;
913+
f32 layer1 = 1;
914+
f32 layer2 = 2;
915915
services->setPixelShaderConstant("baseTexture" , (irr::f32 *)&layer0, 1);
916916
services->setPixelShaderConstant("normalTexture" , (irr::f32 *)&layer1, 1);
917917
services->setPixelShaderConstant("textureFlags" , (irr::f32 *)&layer2, 1);
918918
#else
919+
s32 layer0 = 0;
920+
s32 layer1 = 1;
921+
s32 layer2 = 2;
919922
services->setPixelShaderConstant("baseTexture" , (irr::s32 *)&layer0, 1);
920923
services->setPixelShaderConstant("normalTexture" , (irr::s32 *)&layer1, 1);
921924
services->setPixelShaderConstant("textureFlags" , (irr::s32 *)&layer2, 1);

0 commit comments

Comments
 (0)
Please sign in to comment.