diff --git a/drivers/gles_common/rasterizer_canvas_batcher.h b/drivers/gles_common/rasterizer_canvas_batcher.h index 545033aac05..9def2b95f39 100644 --- a/drivers/gles_common/rasterizer_canvas_batcher.h +++ b/drivers/gles_common/rasterizer_canvas_batcher.h @@ -1288,7 +1288,8 @@ PREAMBLE(bool)::_prefill_line(RasterizerCanvas::Item::CommandLine *p_line, FillS r_fill_state.curr_batch->type = line_batch_type; r_fill_state.curr_batch->color = bcol; - r_fill_state.curr_batch->batch_texture_id = -1; + // cast is to stop sanitizer benign warning .. watch though in case destination type changes + r_fill_state.curr_batch->batch_texture_id = (uint16_t)-1; r_fill_state.curr_batch->first_command = command_num; r_fill_state.curr_batch->num_commands = 1; //r_fill_state.curr_batch->first_quad = bdata.total_quads; diff --git a/drivers/gles_common/rasterizer_storage_common.h b/drivers/gles_common/rasterizer_storage_common.h index ed64b8c50a3..3837aad8bf6 100644 --- a/drivers/gles_common/rasterizer_storage_common.h +++ b/drivers/gles_common/rasterizer_storage_common.h @@ -45,7 +45,7 @@ public: // these flags are specifically for batching // some of the logic is thus in rasterizer_storage.cpp // we could alternatively set bitflags for each 'uses' and test on the fly - enum BatchFlags { + enum BatchFlags : uint32_t { PREVENT_COLOR_BAKING = 1 << 0, PREVENT_VERTEX_BAKING = 1 << 1, @@ -65,7 +65,7 @@ public: BT_DUMMY = 5, // dummy batch is just used to keep the batch creation loop simple }; - enum BatchTypeFlags { + enum BatchTypeFlags : uint32_t { BTF_DEFAULT = 1 << BT_DEFAULT, BTF_RECT = 1 << BT_RECT, BTF_LINE = 1 << BT_LINE, diff --git a/servers/visual_server.h b/servers/visual_server.h index dee3b8749ef..5d177c5e738 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -81,7 +81,7 @@ public: /* TEXTURE API */ - enum TextureFlags { + enum TextureFlags : unsigned int { // unsigned to stop sanitizer complaining about bit operations on ints TEXTURE_FLAG_MIPMAPS = 1, /// Enable automatic mipmap generation - when available TEXTURE_FLAG_REPEAT = 2, /// Repeat texture (Tiling), otherwise Clamping TEXTURE_FLAG_FILTER = 4, /// Create texture with linear (or available) filter