fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 02:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vc4: Use a wrapper file to set VC4_BUILD_NEON instead of CFLAGS.

Browse source 
Android.mk was setting the flag across the entire driver, so we didn't
have non-NEON versions getting built.  This was going to be a problem with
the next commit, when I start auto-detecting NEON support and use the
non-NEON version when appropriate.

Reviewed-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Eric Anholt 2017-04-13 15:09:16 -07:00
parent 463b7d0332
commit a373f77662
4 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/vc4/Android.mk
View file

@ -25,8 +25,6 @@ include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_CFLAGS_arm := -DVC4_BUILD_NEON
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(C_SOURCES) $(C_SOURCES)

6
src/gallium/drivers/vc4/Makefile.am
View file

@ -41,10 +41,4 @@ libvc4_la_SOURCES = $(C_SOURCES)
libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS) libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS)
libvc4_la_LDFLAGS = $(SIM_LDFLAGS) libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
noinst_LTLIBRARIES += libvc4_neon.la
libvc4_la_LIBADD += libvc4_neon.la
libvc4_neon_la_SOURCES = vc4_tiling_lt.c
libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON
EXTRA_DIST = kernel/README EXTRA_DIST = kernel/README

1
src/gallium/drivers/vc4/Makefile.sources
View file

@ -56,6 +56,7 @@ C_SOURCES := \
vc4_state.c \ vc4_state.c \
vc4_tiling.c \ vc4_tiling.c \
vc4_tiling_lt.c \ vc4_tiling_lt.c \
vc4_tiling_lt_neon.c \
vc4_tiling.h \ vc4_tiling.h \
vc4_uniforms.c \ vc4_uniforms.c \
$() $()

30
src/gallium/drivers/vc4/vc4_tiling_lt_neon.c Normal file
View file

@ -0,0 +1,30 @@
/*
* Copyright © 2017 Broadcom
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
/* Wrapper file for building vc4_tiling_lt.c with the "build NEON assembly if
* possible" flag set, since Android.mk doesn't have a way to set CFLAGS for a
* single file.
*/
#define VC4_BUILD_NEON
#include "vc4_tiling_lt.c"