On 02/20/2017 10:41 PM, Gustaw Smolarczyk wrote: > 2017-02-20 11:19 GMT+01:00 Edward O'Callaghan <[email protected]>: >> >> On 02/20/2017 09:15 PM, Edward O'Callaghan wrote: >>> The name has become a little misleading now that it applies >>> to both r600g and radeonsi. >>> >>> V.2: Michel Dänzer - R600_DEBUG must continue to work. >>> >>> Signed-off-by: Edward O'Callaghan <[email protected]> >>> --- >>> src/gallium/drivers/r600/r600_pipe.c | 1 + >>> src/gallium/drivers/radeon/r600_pipe_common.c | 2 ++ >>> src/gallium/drivers/radeonsi/glsl_tests/amdgcn_glslc.c | 1 + >>> src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c | 2 +- >>> src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 4 +++- >>> 5 files changed, 8 insertions(+), 2 deletions(-) >>> >>> diff --git a/src/gallium/drivers/r600/r600_pipe.c >>> b/src/gallium/drivers/r600/r600_pipe.c >>> index 1803c26..f4ab0ee 100644 >>> --- a/src/gallium/drivers/r600/r600_pipe.c >>> +++ b/src/gallium/drivers/r600/r600_pipe.c >>> @@ -641,6 +641,7 @@ struct pipe_screen *r600_screen_create(struct >>> radeon_winsys *ws) >>> } >>> >>> rscreen->b.debug_flags |= debug_get_flags_option("R600_DEBUG", >>> r600_debug_options, 0); >>> + rscreen->b.debug_flags |= debug_get_flags_option("RADEON_DEBUG", >>> r600_debug_options, 0); >>> if (debug_get_bool_option("R600_DEBUG_COMPUTE", FALSE)) >>> rscreen->b.debug_flags |= DBG_COMPUTE; >>> if (debug_get_bool_option("R600_DUMP_SHADERS", FALSE)) >>> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c >>> b/src/gallium/drivers/radeon/r600_pipe_common.c >>> index 1781584..a372cd1 100644 >>> --- a/src/gallium/drivers/radeon/r600_pipe_common.c >>> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c >>> @@ -1257,7 +1257,9 @@ bool r600_common_screen_init(struct >>> r600_common_screen *rscreen, >>> rscreen->ws = ws; >>> rscreen->family = rscreen->info.family; >>> rscreen->chip_class = rscreen->info.chip_class; >>> + >>> rscreen->debug_flags = debug_get_flags_option("R600_DEBUG", >>> common_debug_options, 0); >>> + rscreen->debug_flags = debug_get_flags_option("RADEON_DEBUG", >>> common_debug_options, 0); > > Shouldn't this be |=? yes, disregard this patch sorry for the noise.
> > Regards, > Gustaw >
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
