Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-08-02 19:31:38 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-08-02 19:33:49 +0300
commit8f6ff3adfae7b7f14e0bab293efd0c8231982c89 (patch)
treed37d2abd17a8b324cc5bbc6a1c73cb5c81a4aa3d /source/blender/draw/intern/draw_manager_shader.c
parent3578212e462d2a67f49d64ce5fb64df43200654f (diff)
GPUShader: Add name for debugging & identifying shaders.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_shader.c')
-rw-r--r--source/blender/draw/intern/draw_manager_shader.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index b85e6267687..7aa40b0ce04 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -257,7 +257,7 @@ void DRW_deferred_shader_remove(GPUMaterial *mat)
GPUShader *DRW_shader_create(const char *vert, const char *geom, const char *frag, const char *defines)
{
- return GPU_shader_create(vert, frag, geom, NULL, defines);
+ return GPU_shader_create(vert, frag, geom, NULL, defines, __func__);
}
GPUShader *DRW_shader_create_with_lib(
@@ -274,7 +274,7 @@ GPUShader *DRW_shader_create_with_lib(
geom_with_lib = BLI_string_joinN(lib, geom);
}
- sh = GPU_shader_create(vert_with_lib, frag_with_lib, geom_with_lib, NULL, defines);
+ sh = GPU_shader_create(vert_with_lib, frag_with_lib, geom_with_lib, NULL, defines, __func__);
MEM_freeN(vert_with_lib);
MEM_freeN(frag_with_lib);
@@ -290,22 +290,22 @@ GPUShader *DRW_shader_create_with_transform_feedback(
const GPUShaderTFBType prim_type, const char **varying_names, const int varying_count)
{
return GPU_shader_create_ex(vert, NULL, geom, NULL, defines, GPU_SHADER_FLAGS_NONE,
- prim_type, varying_names, varying_count);
+ prim_type, varying_names, varying_count, __func__);
}
GPUShader *DRW_shader_create_2D(const char *frag, const char *defines)
{
- return GPU_shader_create(datatoc_gpu_shader_2D_vert_glsl, frag, NULL, NULL, defines);
+ return GPU_shader_create(datatoc_gpu_shader_2D_vert_glsl, frag, NULL, NULL, defines, __func__);
}
GPUShader *DRW_shader_create_3D(const char *frag, const char *defines)
{
- return GPU_shader_create(datatoc_gpu_shader_3D_vert_glsl, frag, NULL, NULL, defines);
+ return GPU_shader_create(datatoc_gpu_shader_3D_vert_glsl, frag, NULL, NULL, defines, __func__);
}
GPUShader *DRW_shader_create_fullscreen(const char *frag, const char *defines)
{
- return GPU_shader_create(datatoc_common_fullscreen_vert_glsl, frag, NULL, NULL, defines);
+ return GPU_shader_create(datatoc_common_fullscreen_vert_glsl, frag, NULL, NULL, defines, __func__);
}
GPUShader *DRW_shader_create_3D_depth_only(void)
@@ -351,7 +351,7 @@ GPUMaterial *DRW_shader_create_from_world(
if (mat == NULL) {
mat = GPU_material_from_nodetree(
scene, wo->nodetree, &wo->gpumaterial, engine_type, options,
- vert, geom, frag_lib, defines);
+ vert, geom, frag_lib, defines, wo->id.name);
}
if (GPU_material_status(mat) == GPU_MAT_QUEUED) {
@@ -373,7 +373,7 @@ GPUMaterial *DRW_shader_create_from_material(
if (mat == NULL) {
mat = GPU_material_from_nodetree(
scene, ma->nodetree, &ma->gpumaterial, engine_type, options,
- vert, geom, frag_lib, defines);
+ vert, geom, frag_lib, defines, ma->id.name);
}
if (GPU_material_status(mat) == GPU_MAT_QUEUED) {