AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Make all drm drivers use the new drm compat helper

Browse Source
This commit is contained in:
Jakob Bornecrantz
2010-06-01 04:06:52 +01:00
parent e72b15aa47
commit c1a19689b8
42 changed files with 91 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/targets/dri-i915/Makefile
+1
View File
@@ -13,6 +13,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/i915/libi915.a
C_SOURCES = \
target.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
src/gallium/targets/dri-i915/SConscript
+1 -1
View File
@@ -22,6 +22,6 @@ env.Prepend(LIBS = [
env.LoadableModule(
target = 'i915_dri.so',
source = 'dummy.c',
source = 'target.c',
SHLIBPREFIX = '',
)
src/gallium/targets/dri-i915/dummy.c
View File
src/gallium/targets/dri-i915/target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("i915", "i915")
src/gallium/targets/dri-i965/Makefile
+1
View File
@@ -15,6 +15,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/i965/libi965.a
C_SOURCES = \
target.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
src/gallium/targets/dri-i965/SConscript
+1 -1
View File
@@ -24,6 +24,6 @@ env.Prepend(LIBS = [
env.LoadableModule(
target = 'i965_dri.so',
source = 'dummy.c',
source = 'target.c',
SHLIBPREFIX = '',
)
src/gallium/targets/dri-i965/dummy.c
View File
src/gallium/targets/dri-i965/target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("i965", "i915")
src/gallium/targets/dri-nouveau/Makefile
+1
View File
@@ -11,6 +11,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/nouveau/libnouveau.a
C_SOURCES = \
target.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
src/gallium/targets/dri-nouveau/target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("nouveau", "nouveau")
src/gallium/targets/dri-r600/Makefile
+1
View File
@@ -12,6 +12,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r600/libr600.a
C_SOURCES = \
target.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
src/gallium/targets/dri-r600/SConscript
+1 -1
View File
@@ -22,6 +22,6 @@ env.Prepend(LIBS = [
env.SharedLibrary(
target ='r600_dri.so',
source = 'dummy.c',
source = 'target.c',
SHLIBPREFIX = '',
)
src/gallium/targets/dri-r600/dummy.c
View File
src/gallium/targets/dri-r600/target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("r600", "radeon")
src/gallium/targets/dri-radeong/Makefile
+1
View File
@@ -12,6 +12,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r300/libr300.a
C_SOURCES = \
target.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
src/gallium/targets/dri-radeong/SConscript
+1 -1
View File
@@ -22,6 +22,6 @@ env.Prepend(LIBS = [
env.SharedLibrary(
target ='radeon_dri.so',
source = 'dummy.c',
source = 'target.c',
SHLIBPREFIX = '',
)
src/gallium/targets/dri-radeong/dummy.c
View File
src/gallium/targets/dri-radeong/target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("radeon", "radeon")
src/gallium/targets/dri-vmwgfx/Makefile
+1
View File
@@ -11,6 +11,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/svga/libsvga.a
C_SOURCES = \
target.c \
$(COMMON_GALLIUM_SOURCES)
include ../Makefile.dri
src/gallium/targets/dri-vmwgfx/SConscript
+1 -1
View File
@@ -20,6 +20,6 @@ env.Prepend(LIBS = [
env.LoadableModule(
target = 'vmwgfx_dri.so',
source = 'dummy.c',
source = 'target.c',
SHLIBPREFIX = '',
)
src/gallium/targets/dri-vmwgfx/dummy.c
View File
src/gallium/targets/dri-vmwgfx/target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("vmwgfx", "vmwgfx")
src/gallium/targets/egl-i915/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ TOP = ../../../..
include $(TOP)/configs/current
EGL_DRIVER_NAME = i915
EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_SOURCES = target.c
EGL_DRIVER_LIBS = -ldrm_intel
EGL_DRIVER_PIPES = \
src/gallium/targets/egl-i915/dummy.c → src/gallium/targets/egl-i915/target.c
+5
View File
@@ -1,3 +1,8 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("i915", "i915")
/* A poor man's --whole-archive for EGL drivers */
void *_eglMain(void *);
void *_eglWholeArchive = (void *) _eglMain;
src/gallium/targets/egl-i965/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ TOP = ../../../..
include $(TOP)/configs/current
EGL_DRIVER_NAME = i965
EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_SOURCES = target.c
EGL_DRIVER_LIBS = -ldrm_intel
EGL_DRIVER_PIPES = \
src/gallium/targets/egl-i965/dummy.c → src/gallium/targets/egl-i965/target.c
+5
View File
@@ -1,3 +1,8 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("i965", "i915")
/* A poor man's --whole-archive for EGL drivers */
void *_eglMain(void *);
void *_eglWholeArchive = (void *) _eglMain;
src/gallium/targets/egl-nouveau/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ TOP = ../../../..
include $(TOP)/configs/current
EGL_DRIVER_NAME = nouveau
EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_SOURCES = target.c
EGL_DRIVER_LIBS = -ldrm_nouveau
EGL_DRIVER_PIPES = \
src/gallium/targets/egl-nouveau/target.c
+8
View File
@@ -0,0 +1,8 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("nouveau", "nouveau")
/* A poor man's --whole-archive for EGL drivers */
void *_eglMain(void *);
void *_eglWholeArchive = (void *) _eglMain;
src/gallium/targets/egl-radeon/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ TOP = ../../../..
include $(TOP)/configs/current
EGL_DRIVER_NAME = radeon
EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_SOURCES = target.c
EGL_DRIVER_LIBS = -ldrm_radeon
EGL_DRIVER_PIPES = \
src/gallium/targets/egl-radeon/dummy.c → src/gallium/targets/egl-radeon/target.c
+5
View File
@@ -1,3 +1,8 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("radeon", "radeon")
/* A poor man's --whole-archive for EGL drivers */
void *_eglMain(void *);
void *_eglWholeArchive = (void *) _eglMain;
src/gallium/targets/egl-vmwgfx/Makefile
+1 -1
View File
@@ -2,7 +2,7 @@ TOP = ../../../..
include $(TOP)/configs/current
EGL_DRIVER_NAME = vmwgfx
EGL_DRIVER_SOURCES = dummy.c
EGL_DRIVER_SOURCES = target.c
EGL_DRIVER_LIBS =
EGL_DRIVER_PIPES = \
src/gallium/targets/egl-vmwgfx/dummy.c
-3
View File
@@ -1,3 +0,0 @@
/* A poor man's --whole-archive for EGL drivers */
void *_eglMain(void *);
void *_eglWholeArchive = (void *) _eglMain;
src/gallium/targets/egl-nouveau/dummy.c → src/gallium/targets/egl-vmwgfx/target.c
+4
View File
@@ -1,3 +1,7 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("vmwgfx", "vmwgfx")
/* A poor man's --whole-archive for EGL drivers */
void *_eglMain(void *);
void *_eglWholeArchive = (void *) _eglMain;
src/gallium/targets/xorg-i915/Makefile
+1
View File
@@ -4,6 +4,7 @@ include $(TOP)/configs/current
LIBNAME = modesetting_drv.so
C_SOURCES = \
intel_target.c \
intel_xorg.c
DRIVER_DEFINES = \
src/gallium/targets/xorg-i915/intel_target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("modesetting", "i915")
src/gallium/targets/xorg-i965/Makefile
+1
View File
@@ -4,6 +4,7 @@ include $(TOP)/configs/current
LIBNAME = i965g_drv.so
C_SOURCES = \
intel_target.c \
intel_xorg.c
DRIVER_DEFINES = \
src/gallium/targets/xorg-i965/intel_target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("i965g", "i915")
src/gallium/targets/xorg-nouveau/Makefile
+1
View File
@@ -4,6 +4,7 @@ include $(TOP)/configs/current
LIBNAME = modesetting_drv.so
C_SOURCES = \
nouveau_target.c \
nouveau_xorg.c
DRIVER_DEFINES = \
src/gallium/targets/xorg-nouveau/nouveau_target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("nouveau", "nouveau")
src/gallium/targets/xorg-radeon/radeon_target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("radeon", "radeon")
src/gallium/targets/xorg-vmwgfx/Makefile
+1
View File
@@ -8,6 +8,7 @@ C_SOURCES = \
vmw_video.c \
vmw_ioctl.c \
vmw_ctrl.c \
vmw_target.c \
vmw_screen.c
DRIVER_INCLUDES = \
src/gallium/targets/xorg-vmwgfx/vmw_target.c
+4
View File
@@ -0,0 +1,4 @@
#include "target-helpers/drm_api_compat.h"
DRM_API_COMPAT_STRUCT("vmwgfx", "vmwgfx")