archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

DRW: Augment Debug messages

Browse Source
This commit is contained in:
Clément Foucault
2018-08-03 09:49:22 +02:00
parent fa0f938b11
commit f55863acd4
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/intern/draw_manager.h
View File

@@ -262,10 +262,11 @@ struct DRWShadingGroup {
#ifndef NDEBUG
char attribs_count;
#endif
#if !defined(NDEBUG) || defined(USE_GPU_SELECT)
DRWPass *pass_parent; /* backlink to pass we're in */
#endif
#ifdef USE_GPU_SELECT
GPUVertBuf *inst_selectid;
DRWPass *pass_parent; /* backlink to pass we're in */
int override_selectid; /* Override for single object instances. */
#endif
};

6
source/blender/draw/intern/draw_manager_data.c
View File

@@ -122,7 +122,7 @@ static void drw_shgroup_uniform(DRWShadingGroup *shgroup, const char *name,
if (location == -1) {
if (G.debug & G_DEBUG)
fprintf(stderr, "Uniform '%s' not found!\n", name);
fprintf(stderr, "Pass : %s, Uniform '%s' not found!\n", shgroup->pass_parent->name, name);
/* Nice to enable eventually, for now eevee uses uniforms that might not exist. */
// BLI_assert(0);
return;
@@ -730,7 +730,7 @@ static DRWShadingGroup *drw_shgroup_create_ex(struct GPUShader *shader, DRWPass
shgroup->instance_vbo = NULL;
#endif
#ifdef USE_GPU_SELECT
#if !defined(NDEBUG) || defined(USE_GPU_SELECT)
shgroup->pass_parent = pass;
#endif
@@ -1026,7 +1026,7 @@ DRWPass *DRW_pass_create(const char *name, DRWState state)
{
DRWPass *pass = BLI_mempool_alloc(DST.vmempool->passes);
pass->state = state;
if (G.debug_value > 20) {
if ((G.debug_value > 20) || (G.debug & G_DEBUG)) {
BLI_strncpy(pass->name, name, MAX_PASS_NAME);
}

9
source/blender/draw/intern/draw_manager_exec.c
View File

@@ -950,10 +950,11 @@ static bool ubo_bindings_validate(DRWShadingGroup *shgroup)
char blockname[64];
glGetActiveUniformBlockName(program, i, sizeof(blockname), NULL, blockname);
printf("Trying to draw with missing UBO binding.\n");
printf("Shader : %s, Block : %s\n", shgroup->shader->name, blockname);
valid = false;
if (valid) {
printf("Trying to draw with missing UBO binding.\n");
valid = false;
}
printf("Pass : %s, Shader : %s, Block : %s\n", shgroup->pass_parent->name, shgroup->shader->name, blockname);
}
}
# endif