[Mesa-dev] [PATCH] radeonsi: don't interleave R600_DEBUG-enabled shader dumps

[Nicolai Hähnle]

On 07.07.2016 03:33, Tom Stellard wrote:
> On Wed, Jul 06, 2016 at 11:55:03PM +0200, Nicolai Hähnle wrote:
>> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>>
>> Only setting R600_DEBUG doesn't set any debug callback. Conversely, the debug
>> callback is only called when R600_DEBUG is set.
>
> I don't get any output from shader-db with this patch.

Yeah, I forgot that the code is conservative wrt debug callbacks, which 
can't use multithreading when GL_DEBUG_OUTPUT_SYNCHRONOUS is set. The 
quick fix would be to keep the sctx->b.debug.debug_message setting.

Nicolai

> -Tom
>
>> ---
>>   src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
>> index abbe451..059ff70 100644
>> --- a/src/gallium/drivers/radeonsi/si_state_shaders.c
>> +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
>> @@ -1324,7 +1324,7 @@ static void *si_create_shader_selector(struct pipe_context *ctx,
>>   	pipe_mutex_init(sel->mutex);
>>   	util_queue_fence_init(&sel->ready);
>>
>> -	if (sctx->b.debug.debug_message ||
>> +	if (r600_can_dump_shader(&sscreen->b, sel->info.processor) ||
>>   	    !util_queue_is_initialized(&sscreen->shader_compiler_queue))
>>   		si_init_shader_selector_async(sel, -1);
>>   	else
>> --
>> 2.7.4
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev