From 862dd6ad1c8ad04e27e4189d17d6f95d67a06c90 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Sun, 28 Jan 2024 22:49:33 +0100 Subject: [PATCH] volumetric: fix for opengl --- lib/ivis_opengl/gfx_api_gl.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ivis_opengl/gfx_api_gl.cpp b/lib/ivis_opengl/gfx_api_gl.cpp index 7597d75b253..b93e1fb5b43 100644 --- a/lib/ivis_opengl/gfx_api_gl.cpp +++ b/lib/ivis_opengl/gfx_api_gl.cpp @@ -768,7 +768,7 @@ static const std::map shader_to_file_table = std::make_pair(SHADER_NOLIGHT_INSTANCED, program_data{ "Plain program", "shaders/nolight_instanced.vert", "shaders/nolight_instanced.frag", { // per-frame global uniforms - "ProjectionMatrix", "ViewMatrix", "ModelUVLightmapMatrix", "ShadowMapMVPMatrix", "lightPosition", "sceneColor", "ambient", "diffuse", "specular", "fogColor", "ShadowMapCascadeSplits", "ShadowMapSize", "fogEnd", "fogStart", "graphicsCycle", "fogEnabled", "PointLightsPosition", "PointLightsColorAndEnergy", "bucketOffsetAndSize", "PointLightsIndex", "viewportWidth", "viewportHeight", + "ProjectionMatrix", "ViewMatrix", "ModelUVLightmapMatrix", "ShadowMapMVPMatrix", "lightPosition", "sceneColor", "ambient", "diffuse", "specular", "fogColor", "ShadowMapCascadeSplits", "ShadowMapSize", "fogEnd", "fogStart", "graphicsCycle", "fogEnabled", "PointLightsPosition", "PointLightsColorAndEnergy", "bucketOffsetAndSize", "PointLightsIndex", "viewportWidth", "viewportHeight", "cameraPos", // per-mesh uniforms "tcmask", "normalmap", "specularmap", "hasTangents", }, @@ -2019,10 +2019,10 @@ void gl_pipeline_state_object::set_constants(const gfx_api::Draw3DShapeInstanced void gl_pipeline_state_object::set_constants(const gfx_api::Draw3DShapeInstancedPerMeshUniforms& cbuf) { - setUniforms(22, cbuf.tcmask); - setUniforms(23, cbuf.normalMap); - setUniforms(24, cbuf.specularMap); - setUniforms(25, cbuf.hasTangents); + setUniforms(23, cbuf.tcmask); + setUniforms(24, cbuf.normalMap); + setUniforms(25, cbuf.specularMap); + setUniforms(26, cbuf.hasTangents); } void gl_pipeline_state_object::set_constants(const gfx_api::Draw3DShapeInstancedDepthOnlyGlobalUniforms& cbuf)