drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix OpenGL glUniform mismatch

Browse Source 
Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
This commit is contained in:
renderexpert
2025-06-19 15:53:44 +01:00
committed by Konstantin Pastbin
parent 14b3e8fc8f
commit 344cf6d709
2 changed files with 40 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libs/shaders/program_params.hpp
View File

@@ -126,15 +126,30 @@ struct ALIGNMENT TrafficProgramParams
glsl::mat4 m_projection;
glsl::mat4 m_pivotTransform;
glsl::vec4 m_trafficParams;
glsl::vec3 m_outlineColor;
float m_dummy1; // alignment
glsl::vec3 m_lightArrowColor;
float m_dummy2; // alignment
glsl::vec3 m_darkArrowColor;
float m_dummy3; // alignment
union
{
glsl::vec4 m_outlineColorAligned;
glsl::vec3 m_outlineColor;
};
union
{
glsl::vec4 m_lightArrowColorAligned;
glsl::vec3 m_lightArrowColor;
};
union
{
glsl::vec4 m_darkArrowColorAligned;
glsl::vec3 m_darkArrowColor;
};
float m_outline = 0.0f;
float m_opacity = 1.0f;
TrafficProgramParams()
: m_outlineColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
, m_lightArrowColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
, m_darkArrowColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
{}
BIND_PROGRAMS(TrafficProgramParams,
Program::Traffic,
Program::TrafficLine,
@@ -146,11 +161,16 @@ struct ALIGNMENT TransitProgramParams
glsl::mat4 m_modelView;
glsl::mat4 m_projection;
glsl::mat4 m_pivotTransform;
glsl::vec3 m_params;
float m_dummy1; // alignment
union
{
glsl::vec4 m_paramsAligned;
glsl::vec3 m_params;
};
float m_lineHalfWidth = 0.0f;
float m_maxRadius = 0.0f;
TransitProgramParams() : m_paramsAligned(0.0f, 0.0f, 0.0f, 0.0f) {}
BIND_PROGRAMS(TransitProgramParams,
Program::Transit,
Program::TransitCircle,
@@ -179,14 +199,19 @@ struct ALIGNMENT ShapesProgramParams
glsl::mat4 m_modelView;
glsl::mat4 m_projection;
glsl::mat4 m_pivotTransform;
glsl::vec3 m_position;
float m_dummy1; // alignment
union
{
glsl::vec4 m_positionAligned;
glsl::vec3 m_position;
};
glsl::vec2 m_lineParams;
float m_accuracy = 0.0;
float m_zScale = 1.0f;
float m_opacity = 1.0f;
float m_azimut = 0.0;
ShapesProgramParams() : m_positionAligned(0.0f, 0.0f, 0.0f, 0.0f) {}
BIND_PROGRAMS(ShapesProgramParams,
Program::Accuracy,
Program::MyPosition,