diff options
Diffstat (limited to 'source/blender/draw/engines')
12 files changed, 33 insertions, 33 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 984ecfcea89..0b1eb9476fe 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -314,7 +314,7 @@ void EEVEE_effects_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { static int zero = 0; - static unsigned int six = 6; + static uint six = 6; psl->color_downsample_cube_ps = DRW_pass_create("Downsample Cube", DRW_STATE_WRITE_COLOR); DRWShadingGroup *grp = DRW_shgroup_create(e_data.downsample_cube_sh, psl->color_downsample_cube_ps); DRW_shgroup_uniform_texture_ref(grp, "source", &e_data.color_src); diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 1c0247068cc..21f14371653 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -199,8 +199,8 @@ static void eevee_draw_background(void *vedata) while (loop_ct--) { float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float clear_depth = 1.0f; - unsigned int clear_stencil = 0xFF; - unsigned int primes[3] = {2, 3, 7}; + uint clear_stencil = 0xFF; + uint primes[3] = {2, 3, 7}; double offset[3] = {0.0, 0.0, 0.0}; double r[3]; diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 22eeab55598..5a1fb4f4149 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -571,7 +571,7 @@ void EEVEE_lightprobes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedat DRWShadingGroup *grp = DRW_shgroup_create(e_data.probe_planar_downsample_sh, psl->probe_planar_downsample_ps); DRW_shgroup_uniform_texture_ref(grp, "source", &txl->planar_pool); DRW_shgroup_uniform_float(grp, "fireflyFactor", &sldata->common_data.ssr_firefly_fac, 1); - DRW_shgroup_call_instances_add(grp, DRW_cache_fullscreen_quad_get(), NULL, (unsigned int *)&pinfo->num_planar); + DRW_shgroup_call_instances_add(grp, DRW_cache_fullscreen_quad_get(), NULL, (uint *)&pinfo->num_planar); } } @@ -930,7 +930,7 @@ static void EEVEE_lightprobes_updates(EEVEE_ViewLayerData *sldata, EEVEE_PassLis DRW_shgroup_uniform_vec3(grp, "increment_z", egrid->increment_z, 1); DRW_shgroup_uniform_texture_ref(grp, "irradianceGrid", &sldata->irradiance_pool); DRW_shgroup_uniform_float(grp, "sphere_size", &probe->data_draw_size, 1); - DRW_shgroup_call_instances_add(grp, DRW_cache_sphere_get(), NULL, (unsigned int *)&ped->num_cell); + DRW_shgroup_call_instances_add(grp, DRW_cache_sphere_get(), NULL, (uint *)&ped->num_cell); } } } diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 15d813e56c6..7d2c636e215 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -53,7 +53,7 @@ extern char datatoc_concentric_samples_lib_glsl[]; static void eevee_light_setup(Object *ob, EEVEE_Light *evli); /* *********** LIGHT BITS *********** */ -static void lightbits_set_single(EEVEE_LightBits *bitf, unsigned int idx, bool val) +static void lightbits_set_single(EEVEE_LightBits *bitf, uint idx, bool val) { if (val) { bitf->fields[idx / 8] |= (1 << (idx % 8)); @@ -75,12 +75,12 @@ static void lightbits_or(EEVEE_LightBits *r, const EEVEE_LightBits *v) } } -static bool lightbits_get(const EEVEE_LightBits *r, unsigned int idx) +static bool lightbits_get(const EEVEE_LightBits *r, uint idx) { return r->fields[idx / 8] & (1 << (idx % 8)); } -static void lightbits_convert(EEVEE_LightBits *r, const EEVEE_LightBits *bitf, const int *light_bit_conv_table, unsigned int table_length) +static void lightbits_convert(EEVEE_LightBits *r, const EEVEE_LightBits *bitf, const int *light_bit_conv_table, uint table_length) { for (int i = 0; i < table_length; ++i) { if (lightbits_get(bitf, i) != 0) { @@ -95,7 +95,7 @@ static void lightbits_convert(EEVEE_LightBits *r, const EEVEE_LightBits *bitf, c void EEVEE_lights_init(EEVEE_ViewLayerData *sldata) { - const unsigned int shadow_ubo_size = sizeof(EEVEE_Shadow) * MAX_SHADOW + + const uint shadow_ubo_size = sizeof(EEVEE_Shadow) * MAX_SHADOW + sizeof(EEVEE_ShadowCube) * MAX_SHADOW_CUBE + sizeof(EEVEE_ShadowCascade) * MAX_SHADOW_CASCADE; diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 19e4adaa54f..6819dad8188 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -61,7 +61,7 @@ static struct { struct GPUTexture *util_tex; struct GPUTexture *noise_tex; - unsigned int sss_count; + uint sss_count; float alpha_hash_offset; float noise_offsets[3]; diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 7086351b408..e8ad25527d7 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -337,8 +337,8 @@ typedef struct EEVEE_ShadowCaster { typedef struct EEVEE_ShadowCasterBuffer { struct EEVEE_ShadowCaster *shadow_casters; char *flags; - unsigned int alloc_count; - unsigned int count; + uint alloc_count; + uint count; } EEVEE_ShadowCasterBuffer; /* ************ LIGHT DATA ************* */ @@ -354,7 +354,7 @@ typedef struct EEVEE_LampsInfo { int shadow_cube_store_size; int current_shadow_cascade; int current_shadow_face; - unsigned int shadow_instance_count; + uint shadow_instance_count; float filter_size; /* List of lights in the scene. */ /* XXX This is fragile, can get out of sync quickly. */ @@ -752,7 +752,7 @@ typedef struct EEVEE_ObjectEngineData { bool ob_vis, ob_vis_dirty; bool need_update; - unsigned int shadow_caster_id; + uint shadow_caster_id; } EEVEE_ObjectEngineData; /* *********************************** */ @@ -882,7 +882,7 @@ int EEVEE_subsurface_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_subsurface_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_subsurface_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_subsurface_add_pass( - EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, unsigned int sss_id, struct GPUUniformBuffer *sss_profile); + EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, uint sss_id, struct GPUUniformBuffer *sss_profile); void EEVEE_subsurface_data_render(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_subsurface_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_subsurface_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); @@ -909,7 +909,7 @@ void EEVEE_temporal_sampling_free(void); /* eevee_volumes.c */ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); -void EEVEE_volumes_set_jitter(EEVEE_ViewLayerData *sldata, unsigned int current_sample); +void EEVEE_volumes_set_jitter(EEVEE_ViewLayerData *sldata, uint current_sample); void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, struct Scene *scene, Object *ob); void EEVEE_volumes_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata); diff --git a/source/blender/draw/engines/eevee/eevee_render.c b/source/blender/draw/engines/eevee/eevee_render.c index da42f84baa2..697379e34d1 100644 --- a/source/blender/draw/engines/eevee/eevee_render.c +++ b/source/blender/draw/engines/eevee/eevee_render.c @@ -436,8 +436,8 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl } IDProperty *props = BKE_view_layer_engine_evaluated_get(view_layer, RE_engine_id_BLENDER_EEVEE); - unsigned int tot_sample = BKE_collection_engine_property_value_get_int(props, "taa_render_samples"); - unsigned int render_samples = 0; + uint tot_sample = BKE_collection_engine_property_value_get_int(props, "taa_render_samples"); + uint render_samples = 0; if (RE_engine_test_break(engine)) { return; @@ -446,8 +446,8 @@ void EEVEE_render_draw(EEVEE_Data *vedata, RenderEngine *engine, RenderLayer *rl while (render_samples < tot_sample && !RE_engine_test_break(engine)) { float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float clear_depth = 1.0f; - unsigned int clear_stencil = 0xFF; - unsigned int primes[3] = {2, 3, 7}; + uint clear_stencil = 0xFF; + uint primes[3] = {2, 3, 7}; double offset[3] = {0.0, 0.0, 0.0}; double r[3]; diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c index 5ccc182a54a..d1e760aa123 100644 --- a/source/blender/draw/engines/eevee/eevee_subsurface.c +++ b/source/blender/draw/engines/eevee/eevee_subsurface.c @@ -198,7 +198,7 @@ void EEVEE_subsurface_cache_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data } void EEVEE_subsurface_add_pass( - EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, unsigned int sss_id, struct GPUUniformBuffer *sss_profile) + EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata, uint sss_id, struct GPUUniformBuffer *sss_profile) { DefaultTextureList *dtxl = DRW_viewport_texture_list_get(); EEVEE_PassList *psl = vedata->psl; diff --git a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c index d9db7e45400..889a7f6cdcd 100644 --- a/source/blender/draw/engines/eevee/eevee_temporal_sampling.c +++ b/source/blender/draw/engines/eevee/eevee_temporal_sampling.c @@ -248,7 +248,7 @@ int EEVEE_temporal_sampling_init(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data double ht_point[2]; double ht_offset[2] = {0.0, 0.0}; - unsigned int ht_primes[2] = {2, 3}; + uint ht_primes[2] = {2, 3}; BLI_halton_2D(ht_primes, ht_offset, effects->taa_current_sample - 1, ht_point); diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 700a8d81565..30927d8df6f 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -131,13 +131,13 @@ static void eevee_create_shader_volumes(void) e_data.volumetric_common_lib, NULL); } -void EEVEE_volumes_set_jitter(EEVEE_ViewLayerData *sldata, unsigned int current_sample) +void EEVEE_volumes_set_jitter(EEVEE_ViewLayerData *sldata, uint current_sample) { EEVEE_CommonUniformBuffer *common_data = &sldata->common_data; double ht_point[3]; double ht_offset[3] = {0.0, 0.0}; - unsigned int ht_primes[3] = {3, 7, 2}; + uint ht_primes[3] = {3, 7, 2}; BLI_halton_3D(ht_primes, ht_offset, current_sample, ht_point); @@ -241,8 +241,8 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) } /* Temporal Super sampling jitter */ - unsigned int ht_primes[3] = {3, 7, 2}; - unsigned int current_sample = 0; + uint ht_primes[3] = {3, 7, 2}; + uint current_sample = 0; /* If TAA is in use do not use the history buffer. */ bool do_taa = ((effects->enabled_effects & EFFECT_TAA) != 0); @@ -258,7 +258,7 @@ int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) effects->volume_current_sample = -1; } else { - const unsigned int max_sample = (ht_primes[0] * ht_primes[1] * ht_primes[2]); + const uint max_sample = (ht_primes[0] * ht_primes[1] * ht_primes[2]); current_sample = effects->volume_current_sample = (effects->volume_current_sample + 1) % max_sample; if (current_sample != max_sample - 1) { DRW_viewport_request_redraw(); diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index e0ed2eadf7a..ddc3b5dc698 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -423,7 +423,7 @@ static WORKBENCH_MaterialData *get_or_create_material_data(WORKBENCH_Data *vedat material_template.object_id = engine_object_data->object_id; material_template.drawtype = drawtype; material_template.ima = ima; - unsigned int hash = get_material_hash(&material_template); + uint hash = get_material_hash(&material_template); material = BLI_ghash_lookup(wpd->material_hash, SET_UINT_IN_POINTER(hash)); if (material == NULL) { @@ -575,7 +575,7 @@ void workbench_materials_draw_background(WORKBENCH_Data *vedata) WORKBENCH_PrivateData *wpd = stl->g_data; const float clear_depth = 1.0f; const float clear_color[4] = {0.0f, 0.0f, 0.0f, 0.0f}; - unsigned int clear_stencil = 0xFF; + uint clear_stencil = 0xFF; GPU_framebuffer_bind(fbl->prepass_fb); int clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT; diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c b/source/blender/draw/engines/workbench/workbench_studiolight.c index 8de7eaa52ea..5b1d4432ca7 100644 --- a/source/blender/draw/engines/workbench/workbench_studiolight.c +++ b/source/blender/draw/engines/workbench/workbench_studiolight.c @@ -90,7 +90,7 @@ void studiolight_update_world(int studio_light, WORKBENCH_UBO_World *wd) uint *WORKBENCH_generate_studiolight_preview(int studiolight_id, int icon_size) { - unsigned int *rect = MEM_mallocN(icon_size * icon_size * sizeof(unsigned int), __func__); + uint *rect = MEM_mallocN(icon_size * icon_size * sizeof(uint), __func__); int icon_center = icon_size / 2; float sphere_radius = icon_center * 0.9; @@ -109,11 +109,11 @@ uint *WORKBENCH_generate_studiolight_preview(int studiolight_id, int icon_size) } } } - unsigned int pixelresult = 0x0; - unsigned int alias_i = clamp_i(alias * 256, 0, 255); + uint pixelresult = 0x0; + uint alias_i = clamp_i(alias * 256, 0, 255); if (alias_i != 0) { /* calculate normal */ - unsigned int alias_mask = alias_i << 24; + uint alias_mask = alias_i << 24; float normal[3]; normal[0] = dx / sphere_radius; normal[1] = dy / sphere_radius; |