godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73966 from the-brickster/GLES3_GL_POINT_FIX 

Solution for resolving the issue of point size not functioning correctly in GLES3
This commit is contained in:
Rémi Verschelde 2023-03-02 11:23:48 +01:00
parent 29723da272 f23f0a27c1
commit ec6e072836
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gles3/rasterizer_scene_gles3.cpp
View File

@ -2206,6 +2206,9 @@ void RasterizerSceneGLES3::_render_list_template(RenderListParameters *p_params,
}
RS::PrimitiveType primitive = surf->primitive;
if (shader->uses_point_size) {
primitive = RS::PRIMITIVE_POINTS;
}
static const GLenum prim[5] = { GL_POINTS, GL_LINES, GL_LINE_STRIP, GL_TRIANGLES, GL_TRIANGLE_STRIP };
GLenum primitive_gl = prim[int(primitive)];

4
drivers/gles3/storage/material_storage.cpp
View File

@ -1494,7 +1494,7 @@ MaterialStorage::MaterialStorage() {
actions.renames["LIGHT_VERTEX"] = "light_vertex";
actions.renames["SHADOW_VERTEX"] = "shadow_vertex";
actions.renames["UV"] = "uv";
actions.renames["POINT_SIZE"] = "gl_PointSize";
actions.renames["POINT_SIZE"] = "point_size";
actions.renames["MODEL_MATRIX"] = "model_matrix";
actions.renames["CANVAS_MATRIX"] = "canvas_transform";
@ -1575,7 +1575,7 @@ MaterialStorage::MaterialStorage() {
actions.renames["UV"] = "uv_interp";
actions.renames["UV2"] = "uv2_interp";
actions.renames["COLOR"] = "color_interp";
actions.renames["POINT_SIZE"] = "gl_PointSize";
actions.renames["POINT_SIZE"] = "point_size";
actions.renames["INSTANCE_ID"] = "gl_InstanceID";
actions.renames["VERTEX_ID"] = "gl_VertexID";