Mesa (master): st/egl: Rename kms backend to drm.
Chia-I Wu
olv at kemper.freedesktop.org
Sun Sep 19 09:28:21 UTC 2010
Module: Mesa
Branch: master
Commit: e7424d72405a1cb1fb5ac625b340043aaa9f88be
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e7424d72405a1cb1fb5ac625b340043aaa9f88be
Author: Chia-I Wu <olv at lunarg.com>
Date: Sun Sep 19 16:54:39 2010 +0800
st/egl: Rename kms backend to drm.
The main use of the backend is to support EGL_MESA_drm_display. drm
should be a better name.
---
configure.ac | 2 +-
docs/egl.html | 4 ++--
src/egl/main/Makefile | 2 +-
src/egl/main/egldisplay.c | 2 +-
src/gallium/state_trackers/egl/Makefile | 20 ++++++++++----------
src/gallium/state_trackers/egl/common/egl_g3d.c | 4 ++--
src/gallium/state_trackers/egl/common/native.h | 2 +-
.../state_trackers/egl/{kms => drm}/modeset.c | 2 +-
.../egl/{kms/native_kms.c => drm/native_drm.c} | 10 +++++-----
.../egl/{kms/native_kms.h => drm/native_drm.h} | 0
10 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/configure.ac b/configure.ac
index bf8feb6..b19bf8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1363,7 +1363,7 @@ fi
AC_ARG_WITH([egl-platforms],
[AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
[comma delimited native platforms libEGL supports, e.g.
- "x11,kms" @<:@default=auto@:>@])],
+ "x11,drm" @<:@default=auto@:>@])],
[with_egl_platforms="$withval"],
[with_egl_platforms=yes])
AC_ARG_WITH([egl-displays],
diff --git a/docs/egl.html b/docs/egl.html
index 4758267..d38f2dd 100644
--- a/docs/egl.html
+++ b/docs/egl.html
@@ -72,13 +72,13 @@ drivers will be installed to <code>${libdir}/egl</code>.</p>
<li><code>--with-egl-platforms</code>
<p>List the platforms (window systems) to support. Its argument is a comma
-seprated string such as <code>--with-egl-platforms=x11,kms</code>. It decides
+seprated string such as <code>--with-egl-platforms=x11,drm</code>. It decides
the platforms a driver may support. The first listed platform is also used by
the main library to decide the native platform: the platform the EGL native
types such as <code>EGLNativeDisplayType</code> or
<code>EGLNativeWindowType</code> defined for.</p>
-<p>The available platforms are <code>x11</code>, <code>kms</code>,
+<p>The available platforms are <code>x11</code>, <code>drm</code>,
<code>fbdev</code>, and <code>gdi</code>. The <code>gdi</code> platform can
only be built with SCons.</p>
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index baee1a2..19085a3 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -57,7 +57,7 @@ EGL_NATIVE_PLATFORM=_EGL_INVALID_PLATFORM
ifeq ($(firstword $(EGL_PLATFORMS)),x11)
EGL_NATIVE_PLATFORM=_EGL_PLATFORM_X11
endif
-ifeq ($(firstword $(EGL_PLATFORMS)),kms)
+ifeq ($(firstword $(EGL_PLATFORMS)),drm)
EGL_NATIVE_PLATFORM=_EGL_PLATFORM_DRM
endif
ifeq ($(firstword $(EGL_PLATFORMS)),fbdev)
diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index 31ff090..cc0f03e 100644
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -27,7 +27,7 @@ _eglGetNativePlatformFromEnv(void)
} egl_platforms[_EGL_NUM_PLATFORMS] = {
{ _EGL_PLATFORM_WINDOWS, "gdi" },
{ _EGL_PLATFORM_X11, "x11" },
- { _EGL_PLATFORM_DRM, "kms" },
+ { _EGL_PLATFORM_DRM, "drm" },
{ _EGL_PLATFORM_FBDEV, "fbdev" }
};
_EGLPlatformType plat = _EGL_INVALID_PLATFORM;
diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index 4199d7c..8dbfc5b 100644
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -24,9 +24,9 @@ x11_SOURCES = $(wildcard x11/*.c) \
x11_OBJECTS = $(x11_SOURCES:.c=.o)
-kms_INCLUDES = -I$(TOP)/src/gallium/winsys $(shell pkg-config --cflags-only-I libdrm)
-kms_SOURCES = $(wildcard kms/*.c)
-kms_OBJECTS = $(kms_SOURCES:.c=.o)
+drm_INCLUDES = -I$(TOP)/src/gallium/winsys $(shell pkg-config --cflags-only-I libdrm)
+drm_SOURCES = $(wildcard drm/*.c)
+drm_OBJECTS = $(drm_SOURCES:.c=.o)
fbdev_INCLUDES = -I$(TOP)/src/gallium/winsys/sw
@@ -34,8 +34,8 @@ fbdev_SOURCES = $(wildcard fbdev/*.c)
fbdev_OBJECTS = $(fbdev_SOURCES:.c=.o)
-ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(kms_INCLUDES) $(fbdev_INCLUDES)
-ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(kms_SOURCES) $(fbdev_SOURCES)
+ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(drm_INCLUDES) $(fbdev_INCLUDES)
+ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(drm_SOURCES) $(fbdev_SOURCES)
EGL_OBJECTS = $(common_OBJECTS)
EGL_CPPFLAGS = $(common_INCLUDES)
@@ -45,9 +45,9 @@ ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
EGL_OBJECTS += $(x11_OBJECTS)
EGL_CPPFLAGS += -DHAVE_X11_BACKEND
endif
-ifneq ($(findstring kms, $(EGL_PLATFORMS)),)
-EGL_OBJECTS += $(kms_OBJECTS)
-EGL_CPPFLAGS += -DHAVE_KMS_BACKEND
+ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
+EGL_OBJECTS += $(drm_OBJECTS)
+EGL_CPPFLAGS += -DHAVE_DRM_BACKEND
endif
ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
EGL_OBJECTS += $(fbdev_OBJECTS)
@@ -87,8 +87,8 @@ $(common_OBJECTS): %.o: %.c
$(x11_OBJECTS): %.o: %.c
$(call egl-cc,x11)
-$(kms_OBJECTS): %.o: %.c
- $(call egl-cc,kms)
+$(drm_OBJECTS): %.o: %.c
+ $(call egl-cc,drm)
$(fbdev_OBJECTS): %.o: %.c
$(call egl-cc,fbdev)
diff --git a/src/gallium/state_trackers/egl/common/egl_g3d.c b/src/gallium/state_trackers/egl/common/egl_g3d.c
index 33a838f..ce2b1f7 100644
--- a/src/gallium/state_trackers/egl/common/egl_g3d.c
+++ b/src/gallium/state_trackers/egl/common/egl_g3d.c
@@ -65,8 +65,8 @@ egl_g3d_get_platform(_EGLDriver *drv, _EGLPlatformType plat)
break;
case _EGL_PLATFORM_DRM:
plat_name = "DRM";
-#ifdef HAVE_KMS_BACKEND
- nplat = native_get_kms_platform();
+#ifdef HAVE_DRM_BACKEND
+ nplat = native_get_drm_platform();
#endif
break;
case _EGL_PLATFORM_FBDEV:
diff --git a/src/gallium/state_trackers/egl/common/native.h b/src/gallium/state_trackers/egl/common/native.h
index 9f34c51..3c3f57e 100644
--- a/src/gallium/state_trackers/egl/common/native.h
+++ b/src/gallium/state_trackers/egl/common/native.h
@@ -227,7 +227,7 @@ const struct native_platform *
native_get_x11_platform(void);
const struct native_platform *
-native_get_kms_platform(void);
+native_get_drm_platform(void);
const struct native_platform *
native_get_fbdev_platform(void);
diff --git a/src/gallium/state_trackers/egl/kms/modeset.c b/src/gallium/state_trackers/egl/drm/modeset.c
similarity index 99%
rename from src/gallium/state_trackers/egl/kms/modeset.c
rename to src/gallium/state_trackers/egl/drm/modeset.c
index 9473a0e..5d6a07e 100644
--- a/src/gallium/state_trackers/egl/kms/modeset.c
+++ b/src/gallium/state_trackers/egl/drm/modeset.c
@@ -30,7 +30,7 @@
#include "util/u_inlines.h"
#include "egllog.h"
-#include "native_kms.h"
+#include "native_drm.h"
static boolean
kms_surface_validate(struct native_surface *nsurf, uint attachment_mask,
diff --git a/src/gallium/state_trackers/egl/kms/native_kms.c b/src/gallium/state_trackers/egl/drm/native_drm.c
similarity index 97%
rename from src/gallium/state_trackers/egl/kms/native_kms.c
rename to src/gallium/state_trackers/egl/drm/native_drm.c
index 94880c3..8ffdde6 100644
--- a/src/gallium/state_trackers/egl/kms/native_kms.c
+++ b/src/gallium/state_trackers/egl/drm/native_drm.c
@@ -30,7 +30,7 @@
#include "util/u_memory.h"
#include "egllog.h"
-#include "native_kms.h"
+#include "native_drm.h"
/* see get_drm_screen_name */
#include <radeon_drm.h>
@@ -228,13 +228,13 @@ native_create_display(void *dpy, struct native_event_handler *event_handler,
return kms_create_display(fd, event_handler, user_data);
}
-static const struct native_platform kms_platform = {
- "KMS", /* name */
+static const struct native_platform drm_platform = {
+ "DRM", /* name */
native_create_display
};
const struct native_platform *
-native_get_kms_platform(void)
+native_get_drm_platform(void)
{
- return &kms_platform;
+ return &drm_platform;
}
diff --git a/src/gallium/state_trackers/egl/kms/native_kms.h b/src/gallium/state_trackers/egl/drm/native_drm.h
similarity index 100%
rename from src/gallium/state_trackers/egl/kms/native_kms.h
rename to src/gallium/state_trackers/egl/drm/native_drm.h
More information about the mesa-commit
mailing list