asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #93376 from stuartcarnie/sgc/canvasrd_dead_code

Browse source 
Remove unused flag and code from canvas renderer
This commit is contained in:
Rémi Verschelde 2024-06-20 16:18:53 +02:00
commit a57c7208eb
No known key found for this signature in database
GPG key ID: C3336907360768E1
6 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gles3/rasterizer_canvas_gles3.h
View file

@ -63,7 +63,6 @@ class RasterizerCanvasGLES3 : public RendererCanvasRender {
FLAGS_TRANSPOSE_RECT = (1 << 10), FLAGS_TRANSPOSE_RECT = (1 << 10),
FLAGS_NINEPACH_DRAW_CENTER = (1 << 12), FLAGS_NINEPACH_DRAW_CENTER = (1 << 12),
FLAGS_USING_PARTICLES = (1 << 13),
FLAGS_USE_SKELETON = (1 << 15), FLAGS_USE_SKELETON = (1 << 15),
FLAGS_NINEPATCH_H_MODE_SHIFT = 16, FLAGS_NINEPATCH_H_MODE_SHIFT = 16,

7
drivers/gles3/shaders/canvas.glsl
View file

@ -239,13 +239,6 @@ void main() {
model_matrix = model_matrix * transpose(mat4(instance_xform0, instance_xform1, vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0))); model_matrix = model_matrix * transpose(mat4(instance_xform0, instance_xform1, vec4(0.0, 0.0, 1.0, 0.0), vec4(0.0, 0.0, 0.0, 1.0)));
#endif // USE_INSTANCING #endif // USE_INSTANCING
#if !defined(USE_ATTRIBUTES) && !defined(USE_PRIMITIVE)
if (bool(read_draw_data_flags & FLAGS_USING_PARTICLES)) {
//scale by texture size
vertex /= read_draw_data_color_texture_pixel_size;
}
#endif
vec2 color_texture_pixel_size = read_draw_data_color_texture_pixel_size; vec2 color_texture_pixel_size = read_draw_data_color_texture_pixel_size;
#ifdef USE_POINT_SIZE #ifdef USE_POINT_SIZE

1
drivers/gles3/shaders/canvas_uniforms_inc.glsl
View file

@ -14,7 +14,6 @@
#define FLAGS_TRANSPOSE_RECT uint(1 << 10) #define FLAGS_TRANSPOSE_RECT uint(1 << 10)
// (1 << 11) is for FLAGS_CONVERT_ATTRIBUTES_TO_LINEAR in RD backends, unused here. // (1 << 11) is for FLAGS_CONVERT_ATTRIBUTES_TO_LINEAR in RD backends, unused here.
#define FLAGS_NINEPACH_DRAW_CENTER uint(1 << 12) #define FLAGS_NINEPACH_DRAW_CENTER uint(1 << 12)
#define FLAGS_USING_PARTICLES uint(1 << 13)
#define FLAGS_NINEPATCH_H_MODE_SHIFT 16 #define FLAGS_NINEPATCH_H_MODE_SHIFT 16
#define FLAGS_NINEPATCH_V_MODE_SHIFT 18 #define FLAGS_NINEPATCH_V_MODE_SHIFT 18

1
servers/rendering/renderer_rd/renderer_canvas_render_rd.h
View file

@ -78,7 +78,6 @@ class RendererCanvasRenderRD : public RendererCanvasRender {
FLAGS_CONVERT_ATTRIBUTES_TO_LINEAR = (1 << 11), FLAGS_CONVERT_ATTRIBUTES_TO_LINEAR = (1 << 11),
FLAGS_NINEPACH_DRAW_CENTER = (1 << 12), FLAGS_NINEPACH_DRAW_CENTER = (1 << 12),
FLAGS_USING_PARTICLES = (1 << 13),
FLAGS_USE_SKELETON = (1 << 15), FLAGS_USE_SKELETON = (1 << 15),
FLAGS_NINEPATCH_H_MODE_SHIFT = 16, FLAGS_NINEPATCH_H_MODE_SHIFT = 16,

7
servers/rendering/renderer_rd/shaders/canvas.glsl
View file

@ -193,13 +193,6 @@ void main() {
} }
} }
#if !defined(USE_ATTRIBUTES) && !defined(USE_PRIMITIVE)
if (bool(draw_data.flags & FLAGS_USING_PARTICLES)) {
//scale by texture size
vertex /= draw_data.color_texture_pixel_size;
}
#endif
#ifdef USE_POINT_SIZE #ifdef USE_POINT_SIZE
float point_size = 1.0; float point_size = 1.0;
#endif #endif

1
servers/rendering/renderer_rd/shaders/canvas_uniforms_inc.glsl
View file

@ -14,7 +14,6 @@
#define FLAGS_TRANSPOSE_RECT (1 << 10) #define FLAGS_TRANSPOSE_RECT (1 << 10)
#define FLAGS_CONVERT_ATTRIBUTES_TO_LINEAR (1 << 11) #define FLAGS_CONVERT_ATTRIBUTES_TO_LINEAR (1 << 11)
#define FLAGS_NINEPACH_DRAW_CENTER (1 << 12) #define FLAGS_NINEPACH_DRAW_CENTER (1 << 12)
#define FLAGS_USING_PARTICLES (1 << 13)
#define FLAGS_NINEPATCH_H_MODE_SHIFT 16 #define FLAGS_NINEPATCH_H_MODE_SHIFT 16
#define FLAGS_NINEPATCH_V_MODE_SHIFT 18 #define FLAGS_NINEPATCH_V_MODE_SHIFT 18