diff options
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_lightprobes.c | 81 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 113 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_occlusion.c | 12 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_screen_raytrace.c | 20 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 40 | ||||
-rw-r--r-- | source/blender/draw/intern/DRW_render.h | 14 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 35 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_curve_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_lattice_mode.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/edit_mesh_mode.c | 44 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 16 | ||||
-rw-r--r-- | source/blender/draw/modes/paint_texture_mode.c | 8 | ||||
-rw-r--r-- | source/blender/draw/modes/paint_vertex_mode.c | 4 | ||||
-rw-r--r-- | source/blender/draw/modes/paint_weight_mode.c | 8 |
14 files changed, 204 insertions, 197 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 8bfff35c77d..c6f413f0f82 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -204,54 +204,71 @@ static void lightprobe_shaders_init(void) char *shader_str = NULL; - DRW_shader_create_lib(shader_str, - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_sampling_lib_glsl, - datatoc_lightprobe_filter_glossy_frag_glsl); - e_data.probe_filter_glossy_sh = DRW_shader_create(datatoc_lightprobe_vert_glsl, - datatoc_lightprobe_geom_glsl, - shader_str, - filter_defines); + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_sampling_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_filter_glossy_frag_glsl); + shader_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); + + e_data.probe_filter_glossy_sh = DRW_shader_create( + datatoc_lightprobe_vert_glsl, datatoc_lightprobe_geom_glsl, shader_str, filter_defines); + + e_data.probe_default_sh = DRW_shader_create( + datatoc_background_vert_glsl, NULL, datatoc_default_world_frag_glsl, NULL); + MEM_freeN(shader_str); - e_data.probe_default_sh = DRW_shader_create(datatoc_background_vert_glsl, NULL, - datatoc_default_world_frag_glsl, NULL); + ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_sampling_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_filter_diffuse_frag_glsl); + shader_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); - DRW_shader_create_lib(shader_str, - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_sampling_lib_glsl, - datatoc_lightprobe_filter_diffuse_frag_glsl); e_data.probe_filter_diffuse_sh = DRW_shader_create_fullscreen(shader_str, filter_defines); + MEM_freeN(shader_str); - DRW_shader_create_lib(shader_str, - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_sampling_lib_glsl, - datatoc_lightprobe_filter_visibility_frag_glsl); + ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_sampling_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_filter_visibility_frag_glsl); + shader_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); e_data.probe_filter_visibility_sh = DRW_shader_create_fullscreen(shader_str, filter_defines); MEM_freeN(shader_str); - DRW_shader_create_lib(shader_str, - datatoc_octahedron_lib_glsl, - datatoc_bsdf_common_lib_glsl, - datatoc_irradiance_lib_glsl, - datatoc_lightprobe_lib_glsl, - datatoc_lightprobe_grid_display_frag_glsl); - e_data.probe_grid_display_sh = DRW_shader_create(datatoc_lightprobe_grid_display_vert_glsl, NULL, - shader_str, filter_defines); + ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_octahedron_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_irradiance_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_grid_display_frag_glsl); + shader_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); + + e_data.probe_grid_display_sh = DRW_shader_create( + datatoc_lightprobe_grid_display_vert_glsl, NULL, shader_str, filter_defines); + MEM_freeN(shader_str); - e_data.probe_grid_fill_sh = DRW_shader_create_fullscreen(datatoc_lightprobe_grid_fill_frag_glsl, filter_defines); + e_data.probe_grid_fill_sh = DRW_shader_create_fullscreen( + datatoc_lightprobe_grid_fill_frag_glsl, filter_defines); + + ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_octahedron_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_cube_display_frag_glsl); + shader_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); - DRW_shader_create_lib(shader_str, - datatoc_octahedron_lib_glsl, - datatoc_bsdf_common_lib_glsl, - datatoc_lightprobe_lib_glsl, - datatoc_lightprobe_cube_display_frag_glsl); e_data.probe_cube_display_sh = DRW_shader_create( datatoc_lightprobe_cube_display_vert_glsl, NULL, shader_str, NULL); + MEM_freeN(shader_str); e_data.probe_planar_display_sh = DRW_shader_create( diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index caa8a58c8e6..e93799580ab 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -47,9 +47,7 @@ /* *********** STATIC *********** */ static struct { char *frag_shader_lib; - char *prepass_shader_lib; char *volume_shader_lib; - char *default_frag_glsl; struct GPUShader *default_prepass_sh; struct GPUShader *default_prepass_clip_sh; @@ -118,11 +116,10 @@ static struct GPUTexture *create_ggx_lut_texture(int UNUSED(w), int UNUSED(h)) BLI_dynstr_free(ds_vert); struct GPUShader *sh = DRW_shader_create_with_lib( - datatoc_lightprobe_vert_glsl, datatoc_lightprobe_geom_glsl, datatoc_bsdf_lut_frag_glsl, + datatoc_lightprobe_vert_glsl, datatoc_lightprobe_geom_glsl, datatoc_bsdf_lut_frag_glsl, lib_str, "#define HAMMERSLEY_SIZE 8192\n" "#define BRDF_LUT_SIZE 64\n" - "#define NOISE_SIZE 64\n", - lib_str); + "#define NOISE_SIZE 64\n"); DRWPass *pass = DRW_pass_create("LightProbe Filtering", DRW_STATE_WRITE_COLOR); DRWShadingGroup *grp = DRW_shgroup_create(sh, pass); @@ -421,12 +418,18 @@ static void add_standard_uniforms( static void create_default_shader(int options) { + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, e_data.frag_shader_lib); + BLI_dynstr_append(ds_frag, datatoc_default_frag_glsl); + char *frag_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); + char *defines = eevee_get_defines(options); - e_data.default_lit[options] = DRW_shader_create(datatoc_lit_surface_vert_glsl, NULL, - e_data.default_frag_glsl, defines); + e_data.default_lit[options] = DRW_shader_create(datatoc_lit_surface_vert_glsl, NULL, frag_str, defines); MEM_freeN(defines); + MEM_freeN(frag_str); } void EEVEE_update_util_texture(double offsets[3]) @@ -486,47 +489,48 @@ void EEVEE_update_util_texture(double offsets[3]) void EEVEE_materials_init(EEVEE_StorageList *stl) { if (!e_data.frag_shader_lib) { - DRW_shader_create_lib(e_data.frag_shader_lib, - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_sampling_lib_glsl, - datatoc_ambient_occlusion_lib_glsl, - datatoc_raytrace_lib_glsl, - datatoc_ssr_lib_glsl, - datatoc_octahedron_lib_glsl, - datatoc_irradiance_lib_glsl, - datatoc_lightprobe_lib_glsl, - datatoc_ltc_lib_glsl, - datatoc_bsdf_direct_lib_glsl, - datatoc_lamps_lib_glsl, - /* Add one for each Closure */ - datatoc_lit_surface_frag_glsl, - datatoc_lit_surface_frag_glsl, - datatoc_lit_surface_frag_glsl, - datatoc_lit_surface_frag_glsl, - datatoc_lit_surface_frag_glsl, - datatoc_lit_surface_frag_glsl, - datatoc_lit_surface_frag_glsl, - datatoc_volumetric_lib_glsl); - - DRW_shader_create_lib(e_data.volume_shader_lib, - datatoc_bsdf_common_lib_glsl, - datatoc_ambient_occlusion_lib_glsl, - datatoc_octahedron_lib_glsl, - datatoc_irradiance_lib_glsl, - datatoc_lightprobe_lib_glsl, - datatoc_ltc_lib_glsl, - datatoc_bsdf_direct_lib_glsl, - datatoc_lamps_lib_glsl, - datatoc_volumetric_lib_glsl, - datatoc_volumetric_frag_glsl); - - DRW_shader_create_lib(e_data.default_frag_glsl, - e_data.frag_shader_lib, - datatoc_default_frag_glsl); - - DRW_shader_create_lib(e_data.prepass_shader_lib, - e_data.frag_shader_lib, - datatoc_prepass_frag_glsl); + char *frag_str = NULL; + + /* Shaders */ + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_sampling_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_ambient_occlusion_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_raytrace_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_ssr_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_octahedron_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_irradiance_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_ltc_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_direct_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lamps_lib_glsl); + for (int i = 0; i < 7; ++i) { + /* Add one for each Closure */ + BLI_dynstr_append(ds_frag, datatoc_lit_surface_frag_glsl); + } + BLI_dynstr_append(ds_frag, datatoc_volumetric_lib_glsl); + e_data.frag_shader_lib = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); + + ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_ambient_occlusion_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_octahedron_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_irradiance_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_ltc_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_direct_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lamps_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_volumetric_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_volumetric_frag_glsl); + e_data.volume_shader_lib = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); + + ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, e_data.frag_shader_lib); + BLI_dynstr_append(ds_frag, datatoc_default_frag_glsl); + frag_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); e_data.default_background = DRW_shader_create( datatoc_background_vert_glsl, NULL, datatoc_default_world_frag_glsl, @@ -540,6 +544,8 @@ void EEVEE_materials_init(EEVEE_StorageList *stl) datatoc_prepass_vert_glsl, NULL, datatoc_prepass_frag_glsl, "#define CLIP_PLANES\n"); + MEM_freeN(frag_str); + double offsets[3] = {0.0, 0.0, 0.0}; EEVEE_update_util_texture(offsets); } @@ -733,13 +739,20 @@ struct GPUMaterial *EEVEE_material_mesh_depth_get( char *defines = eevee_get_defines(options); + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, e_data.frag_shader_lib); + BLI_dynstr_append(ds_frag, datatoc_prepass_frag_glsl); + char *frag_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); + mat = GPU_material_from_nodetree( scene, ma->nodetree, &ma->gpumaterial, engine, options, (is_shadow) ? datatoc_shadow_vert_glsl : datatoc_lit_surface_vert_glsl, (is_shadow) ? datatoc_shadow_geom_glsl : NULL, - e_data.prepass_shader_lib, + frag_str, defines); + MEM_freeN(frag_str); MEM_freeN(defines); return mat; @@ -1438,9 +1451,7 @@ void EEVEE_materials_free(void) DRW_SHADER_FREE_SAFE(e_data.default_lit[i]); } MEM_SAFE_FREE(e_data.frag_shader_lib); - MEM_SAFE_FREE(e_data.prepass_shader_lib); MEM_SAFE_FREE(e_data.volume_shader_lib); - MEM_SAFE_FREE(e_data.default_frag_glsl); DRW_SHADER_FREE_SAFE(e_data.default_prepass_sh); DRW_SHADER_FREE_SAFE(e_data.default_prepass_clip_sh); DRW_SHADER_FREE_SAFE(e_data.default_background); diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.c b/source/blender/draw/engines/eevee/eevee_occlusion.c index bf76e9350a1..0ae5fb91db3 100644 --- a/source/blender/draw/engines/eevee/eevee_occlusion.c +++ b/source/blender/draw/engines/eevee/eevee_occlusion.c @@ -49,12 +49,12 @@ extern char datatoc_effect_gtao_frag_glsl[]; static void eevee_create_shader_occlusion(void) { - char *frag_str; - - DRW_shader_create_lib(frag_str, - datatoc_bsdf_common_lib_glsl, - datatoc_ambient_occlusion_lib_glsl, - datatoc_effect_gtao_frag_glsl); + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_ambient_occlusion_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_effect_gtao_frag_glsl); + char *frag_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); e_data.gtao_sh = DRW_shader_create_fullscreen(frag_str, NULL); e_data.gtao_layer_sh = DRW_shader_create_fullscreen(frag_str, "#define LAYERED_DEPTH\n"); diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c index f61d94c17eb..f4b8ab807f6 100644 --- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c +++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c @@ -59,16 +59,16 @@ extern char datatoc_raytrace_lib_glsl[]; static struct GPUShader *eevee_effects_screen_raytrace_shader_get(int options) { if (e_data.ssr_sh[options] == NULL) { - char *ssr_shader_str; - - DRW_shader_create_lib(ssr_shader_str, - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_sampling_lib_glsl, - datatoc_octahedron_lib_glsl, - datatoc_lightprobe_lib_glsl, - datatoc_ambient_occlusion_lib_glsl, - datatoc_raytrace_lib_glsl, - datatoc_effect_ssr_frag_glsl); + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_sampling_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_octahedron_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lightprobe_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_ambient_occlusion_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_raytrace_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_effect_ssr_frag_glsl); + char *ssr_shader_str = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); DynStr *ds_defines = BLI_dynstr_new(); BLI_dynstr_appendf(ds_defines, SHADER_DEFINES); diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index db5ee19172e..dae4503dc32 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -77,44 +77,46 @@ extern char datatoc_gpu_shader_fullscreen_vert_glsl[]; static void eevee_create_shader_volumes(void) { - DRW_shader_create_lib(e_data.volumetric_common_lib, - datatoc_bsdf_common_lib_glsl, - datatoc_volumetric_lib_glsl); - - DRW_shader_create_lib(e_data.volumetric_common_lamps_lib, - datatoc_bsdf_common_lib_glsl, - datatoc_bsdf_direct_lib_glsl, - datatoc_octahedron_lib_glsl, - datatoc_irradiance_lib_glsl, - datatoc_lamps_lib_glsl, - datatoc_volumetric_lib_glsl); + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_volumetric_lib_glsl); + e_data.volumetric_common_lib = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); + + ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, datatoc_bsdf_common_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_bsdf_direct_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_octahedron_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_irradiance_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_lamps_lib_glsl); + BLI_dynstr_append(ds_frag, datatoc_volumetric_lib_glsl); + e_data.volumetric_common_lamps_lib = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); e_data.volumetric_clear_sh = DRW_shader_create_with_lib( datatoc_volumetric_vert_glsl, datatoc_volumetric_geom_glsl, datatoc_volumetric_frag_glsl, + e_data.volumetric_common_lib, "#define VOLUMETRICS\n" - "#define CLEAR\n", - e_data.volumetric_common_lib); + "#define CLEAR\n"); e_data.volumetric_scatter_sh = DRW_shader_create_with_lib( datatoc_volumetric_vert_glsl, datatoc_volumetric_geom_glsl, datatoc_volumetric_scatter_frag_glsl, + e_data.volumetric_common_lamps_lib, SHADER_DEFINES "#define VOLUMETRICS\n" - "#define VOLUME_SHADOW\n", - e_data.volumetric_common_lamps_lib); + "#define VOLUME_SHADOW\n"); e_data.volumetric_integration_sh = DRW_shader_create_with_lib( datatoc_volumetric_vert_glsl, datatoc_volumetric_geom_glsl, datatoc_volumetric_integration_frag_glsl, - NULL, - e_data.volumetric_common_lib); + e_data.volumetric_common_lib, NULL); e_data.volumetric_resolve_sh = DRW_shader_create_with_lib( datatoc_gpu_shader_fullscreen_vert_glsl, NULL, datatoc_volumetric_resolve_frag_glsl, - NULL, - e_data.volumetric_common_lib); + e_data.volumetric_common_lib, NULL); } int EEVEE_volumes_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index eafa8543940..826d3a22d68 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -258,19 +258,7 @@ void DRW_transform_to_display(struct GPUTexture *tex); struct GPUShader *DRW_shader_create( const char *vert, const char *geom, const char *frag, const char *defines); struct GPUShader *DRW_shader_create_with_lib( - const char *vert, const char *geom, const char *frag, const char *defines, ...); -/* This macro concatenates all strings into its first arg. - * Remmeber to free the resulting string after use. */ -#define DRW_shader_create_lib(r_lib, ...) do { \ - const char *array[] = {__VA_ARGS__}; \ - DynStr *ds_frag = BLI_dynstr_new(); \ - for (int i = 0; i < (sizeof(array) / sizeof(*array)); ++i) { \ - BLI_dynstr_append(ds_frag, array[i]); \ - } \ - r_lib = BLI_dynstr_get_cstring(ds_frag); \ - BLI_dynstr_free(ds_frag); \ -} while (0) - + const char *vert, const char *geom, const char *frag, const char *lib, const char *defines); struct GPUShader *DRW_shader_create_2D(const char *frag, const char *defines); struct GPUShader *DRW_shader_create_3D(const char *frag, const char *defines); struct GPUShader *DRW_shader_create_fullscreen(const char *frag, const char *defines); diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 1bbefe61b22..ae7712a36c3 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -577,39 +577,28 @@ GPUShader *DRW_shader_create(const char *vert, const char *geom, const char *fra } GPUShader *DRW_shader_create_with_lib( - const char *vert, const char *geom, const char *frag, const char *defines, ...) + const char *vert, const char *geom, const char *frag, const char *lib, const char *defines) { GPUShader *sh; char *vert_with_lib = NULL; char *frag_with_lib = NULL; char *geom_with_lib = NULL; - va_list args; - { - DynStr *ds_vert = BLI_dynstr_new(); - va_start(args, defines); - BLI_dynstr_append(ds_vert, va_arg(args, char *)); - va_end(args); - BLI_dynstr_append(ds_vert, vert); - vert_with_lib = BLI_dynstr_get_cstring(ds_vert); - BLI_dynstr_free(ds_vert); - } + DynStr *ds_vert = BLI_dynstr_new(); + BLI_dynstr_append(ds_vert, lib); + BLI_dynstr_append(ds_vert, vert); + vert_with_lib = BLI_dynstr_get_cstring(ds_vert); + BLI_dynstr_free(ds_vert); - { - DynStr *ds_frag = BLI_dynstr_new(); - va_start(args, defines); - BLI_dynstr_append(ds_frag, va_arg(args, char *)); - va_end(args); - BLI_dynstr_append(ds_frag, frag); - frag_with_lib = BLI_dynstr_get_cstring(ds_frag); - BLI_dynstr_free(ds_frag); - } + DynStr *ds_frag = BLI_dynstr_new(); + BLI_dynstr_append(ds_frag, lib); + BLI_dynstr_append(ds_frag, frag); + frag_with_lib = BLI_dynstr_get_cstring(ds_frag); + BLI_dynstr_free(ds_frag); if (geom) { DynStr *ds_geom = BLI_dynstr_new(); - va_start(args, defines); - BLI_dynstr_append(ds_geom, va_arg(args, char *)); - va_end(args); + BLI_dynstr_append(ds_geom, lib); BLI_dynstr_append(ds_geom, geom); geom_with_lib = BLI_dynstr_get_cstring(ds_geom); BLI_dynstr_free(ds_geom); diff --git a/source/blender/draw/modes/edit_curve_mode.c b/source/blender/draw/modes/edit_curve_mode.c index 6b37e04a794..ec12f7570c2 100644 --- a/source/blender/draw/modes/edit_curve_mode.c +++ b/source/blender/draw/modes/edit_curve_mode.c @@ -164,14 +164,14 @@ static void EDIT_CURVE_engine_init(void *vedata) datatoc_edit_curve_overlay_loosevert_vert_glsl, datatoc_edit_curve_overlay_handle_geom_glsl, datatoc_gpu_shader_flat_color_frag_glsl, - NULL, datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, NULL); } if (!e_data.overlay_vert_sh) { e_data.overlay_vert_sh = DRW_shader_create_with_lib( datatoc_edit_curve_overlay_loosevert_vert_glsl, NULL, datatoc_edit_curve_overlay_frag_glsl, - NULL, datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, NULL); } } diff --git a/source/blender/draw/modes/edit_lattice_mode.c b/source/blender/draw/modes/edit_lattice_mode.c index 23352118e04..ff4c557326e 100644 --- a/source/blender/draw/modes/edit_lattice_mode.c +++ b/source/blender/draw/modes/edit_lattice_mode.c @@ -151,7 +151,7 @@ static void EDIT_LATTICE_engine_init(void *vedata) e_data.overlay_vert_sh = DRW_shader_create_with_lib( datatoc_edit_lattice_overlay_loosevert_vert_glsl, NULL, datatoc_edit_lattice_overlay_frag_glsl, - NULL, datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, NULL); } } diff --git a/source/blender/draw/modes/edit_mesh_mode.c b/source/blender/draw/modes/edit_mesh_mode.c index 110988a8420..1a8c03e3933 100644 --- a/source/blender/draw/modes/edit_mesh_mode.c +++ b/source/blender/draw/modes/edit_mesh_mode.c @@ -156,72 +156,72 @@ static void EDIT_MESH_engine_init(void *vedata) datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, + datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING", - datatoc_common_globals_lib_glsl); + "#define VERTEX_FACING"); } if (!e_data.overlay_tri_fast_sh) { e_data.overlay_tri_fast_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, + datatoc_common_globals_lib_glsl, "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n", - datatoc_common_globals_lib_glsl); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_tri_vcol_sh) { e_data.overlay_tri_vcol_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, + datatoc_common_globals_lib_glsl, "#define EDGE_FIX\n" "#define VERTEX_SELECTION\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n", - datatoc_common_globals_lib_glsl); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_tri_vcol_fast_sh) { e_data.overlay_tri_vcol_fast_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_tri_glsl, datatoc_edit_mesh_overlay_frag_glsl, + datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n" "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n", - datatoc_common_globals_lib_glsl); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_edge_sh) { e_data.overlay_edge_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_edge_glsl, datatoc_edit_mesh_overlay_frag_glsl, + datatoc_common_globals_lib_glsl, "#define ANTI_ALIASING\n" - "#define VERTEX_FACING\n", - datatoc_common_globals_lib_glsl); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_edge_vcol_sh) { e_data.overlay_edge_vcol_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_vert_glsl, datatoc_edit_mesh_overlay_geom_edge_glsl, datatoc_edit_mesh_overlay_frag_glsl, + datatoc_common_globals_lib_glsl, "#define VERTEX_SELECTION\n" - "#define VERTEX_FACING\n", - datatoc_common_globals_lib_glsl); + "#define VERTEX_FACING\n"); } if (!e_data.overlay_vert_sh) { e_data.overlay_vert_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_loosevert_vert_glsl, NULL, datatoc_edit_mesh_overlay_frag_glsl, - "#define VERTEX_SELECTION\n", - datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, + "#define VERTEX_SELECTION\n"); } if (!e_data.overlay_facedot_sh) { e_data.overlay_facedot_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_facedot_vert_glsl, NULL, datatoc_edit_mesh_overlay_facedot_frag_glsl, - "#define VERTEX_FACING\n", - datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, + "#define VERTEX_FACING\n"); } if (!e_data.overlay_mix_sh) { e_data.overlay_mix_sh = DRW_shader_create_fullscreen(datatoc_edit_mesh_overlay_mix_frag_glsl, NULL); @@ -230,27 +230,27 @@ static void EDIT_MESH_engine_init(void *vedata) e_data.overlay_facefill_sh = DRW_shader_create_with_lib( datatoc_edit_mesh_overlay_facefill_vert_glsl, NULL, datatoc_edit_mesh_overlay_facefill_frag_glsl, - NULL, datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, NULL); } if (!e_data.normals_face_sh) { e_data.normals_face_sh = DRW_shader_create( datatoc_edit_normals_vert_glsl, datatoc_edit_normals_geom_glsl, - "#define FACE_NORMALS\n", - datatoc_gpu_shader_uniform_color_frag_glsl); + datatoc_gpu_shader_uniform_color_frag_glsl, + "#define FACE_NORMALS\n"); } if (!e_data.normals_loop_sh) { e_data.normals_loop_sh = DRW_shader_create( datatoc_edit_normals_vert_glsl, datatoc_edit_normals_geom_glsl, - "#define LOOP_NORMALS\n", - datatoc_gpu_shader_uniform_color_frag_glsl); + datatoc_gpu_shader_uniform_color_frag_glsl, + "#define LOOP_NORMALS\n"); } if (!e_data.normals_sh) { e_data.normals_sh = DRW_shader_create( datatoc_edit_normals_vert_glsl, datatoc_edit_normals_geom_glsl, - NULL, datatoc_gpu_shader_uniform_color_frag_glsl); + datatoc_gpu_shader_uniform_color_frag_glsl, NULL); } if (!e_data.depth_sh) { e_data.depth_sh = DRW_shader_create_3D_depth_only(); diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 06c19844d7c..4e19eff3cfb 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -291,9 +291,9 @@ static void OBJECT_engine_init(void *vedata) e_data.outline_resolve_aa_sh = DRW_shader_create_with_lib( datatoc_gpu_shader_fullscreen_vert_glsl, NULL, datatoc_object_outline_resolve_frag_glsl, + datatoc_common_fxaa_lib_glsl, "#define FXAA_ALPHA\n" - "#define USE_FXAA\n", - datatoc_common_fxaa_lib_glsl); + "#define USE_FXAA\n"); } if (!e_data.outline_detect_sh) { @@ -307,23 +307,23 @@ static void OBJECT_engine_init(void *vedata) if (!e_data.object_empty_image_sh) { e_data.object_empty_image_sh = DRW_shader_create_with_lib( datatoc_object_empty_image_vert_glsl, NULL, - datatoc_object_empty_image_frag_glsl, NULL, - datatoc_common_globals_lib_glsl); + datatoc_object_empty_image_frag_glsl, + datatoc_common_globals_lib_glsl, NULL); } if (!e_data.object_empty_image_wire_sh) { e_data.object_empty_image_wire_sh = DRW_shader_create_with_lib( datatoc_object_empty_image_vert_glsl, NULL, datatoc_object_empty_image_frag_glsl, - "#define USE_WIRE\n", - datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, + "#define USE_WIRE\n"); } if (!e_data.grid_sh) { e_data.grid_sh = DRW_shader_create_with_lib( datatoc_object_grid_vert_glsl, NULL, - datatoc_object_grid_frag_glsl, NULL, - datatoc_common_globals_lib_glsl); + datatoc_object_grid_frag_glsl, + datatoc_common_globals_lib_glsl, NULL); } if (!e_data.part_prim_sh) { diff --git a/source/blender/draw/modes/paint_texture_mode.c b/source/blender/draw/modes/paint_texture_mode.c index 505f4d1494d..b49da0cba2f 100644 --- a/source/blender/draw/modes/paint_texture_mode.c +++ b/source/blender/draw/modes/paint_texture_mode.c @@ -161,8 +161,8 @@ static void PAINT_TEXTURE_engine_init(void *vedata) e_data.image_sh = DRW_shader_create_with_lib( datatoc_paint_texture_vert_glsl, NULL, - datatoc_paint_texture_frag_glsl, NULL, - datatoc_common_globals_lib_glsl); + datatoc_paint_texture_frag_glsl, + datatoc_common_globals_lib_glsl, NULL); } @@ -170,8 +170,8 @@ static void PAINT_TEXTURE_engine_init(void *vedata) e_data.wire_overlay_shader = DRW_shader_create_with_lib( datatoc_paint_wire_vert_glsl, NULL, datatoc_paint_wire_frag_glsl, - "#define VERTEX_MODE\n", - datatoc_common_globals_lib_glsl); + datatoc_common_globals_lib_glsl, + "#define VERTEX_MODE\n"); } if (!e_data.face_overlay_shader) { diff --git a/source/blender/draw/modes/paint_vertex_mode.c b/source/blender/draw/modes/paint_vertex_mode.c index 53686b052a7..e430fca5742 100644 --- a/source/blender/draw/modes/paint_vertex_mode.c +++ b/source/blender/draw/modes/paint_vertex_mode.c @@ -87,8 +87,8 @@ static void PAINT_VERTEX_engine_init(void *UNUSED(vedata)) if (!e_data.wire_overlay_shader) { e_data.wire_overlay_shader = DRW_shader_create_with_lib( datatoc_paint_wire_vert_glsl, NULL, - datatoc_paint_wire_frag_glsl, "#define VERTEX_MODE\n", - datatoc_common_globals_lib_glsl); + datatoc_paint_wire_frag_glsl, + datatoc_common_globals_lib_glsl, "#define VERTEX_MODE\n"); } if (!e_data.face_overlay_shader) { diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c index 067baf6a199..e139b4af97f 100644 --- a/source/blender/draw/modes/paint_weight_mode.c +++ b/source/blender/draw/modes/paint_weight_mode.c @@ -102,8 +102,8 @@ static void PAINT_WEIGHT_engine_init(void *UNUSED(vedata)) if (!e_data.wire_overlay_shader) { e_data.wire_overlay_shader = DRW_shader_create_with_lib( datatoc_paint_wire_vert_glsl, NULL, - datatoc_paint_wire_frag_glsl, "#define WEIGHT_MODE\n", - datatoc_common_globals_lib_glsl); + datatoc_paint_wire_frag_glsl, + datatoc_common_globals_lib_glsl, "#define WEIGHT_MODE\n"); } if (!e_data.face_overlay_shader) { @@ -113,8 +113,8 @@ static void PAINT_WEIGHT_engine_init(void *UNUSED(vedata)) if (!e_data.vert_overlay_shader) { e_data.vert_overlay_shader = DRW_shader_create_with_lib( datatoc_paint_wire_vert_glsl, NULL, - datatoc_paint_vert_frag_glsl, NULL, - datatoc_common_globals_lib_glsl); + datatoc_paint_vert_frag_glsl, + datatoc_common_globals_lib_glsl, NULL); } } |