fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 15:00:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

virgl: straighten the includes confusion

Browse source 
Use the relevant GALLIUM_foo_CFLAGS which has all the requirements
(not to mention VISIBITY_CFLAGS) and keep ../ out of the include
directives.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Emil Velikov 2015-10-26 11:53:36 +00:00 • committed by Emil Velikov
parent 2c705d2220
commit 014f8ef2ff
6 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/virgl/Makefile.am
View file

@ -24,10 +24,7 @@ include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CPPFLAGS = \
-I$(top_srcdir)/src/gallium/drivers \
-I$(top_srcdir)/src/gallium/winsys/virgl/drm \
-I$(top_srcdir)/include \
$(GALLIUM_CFLAGS) \
$(GALLIUM_DRIVER_CFLAGS) \
$(LIBDRM_CFLAGS)
noinst_LTLIBRARIES = libvirgl.la

2
src/gallium/drivers/virgl/virgl.h
View file

@ -25,7 +25,7 @@
#include "util/u_transfer.h"
#include "../winsys/virgl/drm/virgl_hw.h"
#include "virgl/drm/virgl_hw.h"
#include "virgl_winsys.h"
#include "pipe/p_screen.h"

2
src/gallium/drivers/virgl/virgl_resource.h
View file

@ -29,7 +29,7 @@
#include "util/list.h"
#include "util/u_transfer.h"
#include "virgl_hw.h"
#include "virgl/drm/virgl_hw.h"
#define VR_MAX_TEXTURE_2D_LEVELS 15
struct virgl_screen;

4
src/gallium/winsys/virgl/drm/Makefile.am
View file

@ -24,9 +24,9 @@ include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/drivers \
$(GALLIUM_CFLAGS) \
-I$(top_srcdir)/src/gallium/winsys \
$(GALLIUM_WINSYS_CFLAGS) \
$(LIBDRM_CFLAGS)
noinst_LTLIBRARIES = libvirgldrm.la

4
src/gallium/winsys/virgl/vtest/Makefile.am
View file

@ -24,9 +24,9 @@ include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/drivers \
$(GALLIUM_CFLAGS)
-I$(top_srcdir)/src/gallium/winsys \
$(GALLIUM_WINSYS_CFLAGS)
noinst_LTLIBRARIES = libvirglvtest.la

2
src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
View file

@ -28,7 +28,7 @@
#include "pipe/p_defines.h"
#include "pipe/p_state.h"
#include "state_tracker/sw_winsys.h"
#include "../drm/virgl_hw.h"
#include "virgl/drm/virgl_hw.h"
#include "virgl/virgl_winsys.h"
#include "util/list.h"
#include "os/os_thread.h"