[Mesa-dev] [PATCH 17/24] targets/omx: define GALLIUM_TRACE when using the trace driver

[Emil Velikov]

On 28/03/14 09:40, Christian König wrote:
> Am 27.03.2014 22:00, schrieb Emil Velikov:
>> Otherwise the omx drivers are explicitly linked but never wrapped in
>> order to use it.
> 
> On the other hand I'm not sure if we really need the tracer linked in here,
> referencing it was just to make drm_target.c happy.
> 
Fair enough, although I'm not sure what you're implying with "make
drm_target.c happy" here. AFAICS the tracer should be mentioned only when the
define is present.

And indeed, dropping the define + driver from LIBADD does build. Build tested
only, due to lack of hw :(

-Emil

> Christian.
> 
>> Cc: Christian König <christian.koenig at amd.com>
>> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
>> ---
>>   src/gallium/targets/r600/omx/Makefile.am     | 3 ++-
>>   src/gallium/targets/radeonsi/omx/Makefile.am | 3 ++-
>>   2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/gallium/targets/r600/omx/Makefile.am
>> b/src/gallium/targets/r600/omx/Makefile.am
>> index 22ef08f..0bae51b 100644
>> --- a/src/gallium/targets/r600/omx/Makefile.am
>> +++ b/src/gallium/targets/r600/omx/Makefile.am
>> @@ -31,7 +31,8 @@ AM_CFLAGS = \
>>       $(LIBDRM_CFLAGS)
>>   AM_CPPFLAGS = \
>>       -I$(top_srcdir)/src/gallium/drivers \
>> -    -I$(top_srcdir)/src/gallium/winsys
>> +    -I$(top_srcdir)/src/gallium/winsys \
>> +    -DGALLIUM_TRACE
>>     omxdir = $(OMX_LIB_INSTALL_DIR)
>>   omx_LTLIBRARIES = libomx_r600.la
>> diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am
>> b/src/gallium/targets/radeonsi/omx/Makefile.am
>> index 439e91c..c0e0218 100644
>> --- a/src/gallium/targets/radeonsi/omx/Makefile.am
>> +++ b/src/gallium/targets/radeonsi/omx/Makefile.am
>> @@ -31,7 +31,8 @@ AM_CFLAGS = \
>>       $(LIBDRM_CFLAGS)
>>   AM_CPPFLAGS = \
>>       -I$(top_srcdir)/src/gallium/drivers \
>> -    -I$(top_srcdir)/src/gallium/winsys
>> +    -I$(top_srcdir)/src/gallium/winsys \
>> +    -DGALLIUM_TRACE
>>     omxdir = $(OMX_LIB_INSTALL_DIR)
>>   omx_LTLIBRARIES = libomx_radeonsi.la
> 
>