griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: DRW: Remove global access function DRW_viewport_pixelsize_get

Browse Source
This commit is contained in:
Clément Foucault
2025-02-10 22:51:29 +01:00
committed by Clément Foucault
parent 09e7e878e6
commit 9bded245cc
4 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/intern/DRW_render.hh
View File

@@ -116,7 +116,6 @@ void DRW_shader_queue_optimize_material(GPUMaterial *mat);
const float *DRW_viewport_size_get();
const float *DRW_viewport_invert_size_get();
const float *DRW_viewport_pixelsize_get();
DefaultFramebufferList *DRW_viewport_framebuffer_list_get();
DefaultTextureList *DRW_viewport_texture_list_get();

2
source/blender/draw/intern/draw_common.cc
View File

@@ -205,7 +205,7 @@ void DRW_globals_update()
gb->size_edge = U.pixelsize * max_ff(1.0f, UI_GetThemeValuef(TH_EDGE_WIDTH)) / 2.0f;
gb->size_edge_fix = U.pixelsize * (0.5f + 2.0f * (1.0f * (gb->size_edge * float(M_SQRT1_2))));
gb->pixel_fac = *DRW_viewport_pixelsize_get();
gb->pixel_fac = (ctx->rv3d) ? ctx->rv3d->pixsize : 1.0f;
copy_v2_v2(&gb->size_viewport[0], DRW_viewport_size_get());
copy_v2_v2(&gb->size_viewport[2], &gb->size_viewport[0]);

9
source/blender/draw/intern/draw_manager_c.cc
View File

@@ -296,11 +296,6 @@ const float *DRW_viewport_invert_size_get()
return DST.inv_size;
}
const float *DRW_viewport_pixelsize_get()
{
return &DST.pixsize;
}
/* Not a viewport variable, we could split this out. */
static void drw_context_state_init()
{
@@ -460,7 +455,6 @@ static void drw_manager_init(DRWManager *dst, GPUViewport *viewport, const int s
dst->default_framebuffer = dfbl->default_fb;
if (rv3d != nullptr) {
dst->pixsize = rv3d->pixsize;
blender::draw::View::default_set(float4x4(rv3d->viewmat), float4x4(rv3d->winmat));
}
else if (region) {
@@ -479,9 +473,6 @@ static void drw_manager_init(DRWManager *dst, GPUViewport *viewport, const int s
blender::draw::View::default_set(float4x4(viewmat), float4x4(winmat));
}
else {
dst->pixsize = 1.0f;
}
/* fclem: Is this still needed ? */
if (dst->draw_ctx.object_edit && rv3d) {

1
source/blender/draw/intern/draw_manager_c.hh
View File

@@ -175,7 +175,6 @@ struct DRWManager {
GPUFrameBuffer *default_framebuffer;
float size[2];
float inv_size[2];
float pixsize;
struct {
uint is_select : 1;