2
0
Эх сурвалжийг харах

kmsdrm: Cleanup unused headers, rename SDL_kmsdrmevents_c.h -> SDL_kmsdrmevents.h

Brandon Schaefer 8 жил өмнө
parent
commit
1171718473

+ 1 - 0
src/video/kmsdrm/SDL_kmsdrmdyn.c

@@ -18,6 +18,7 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
+
 #include "../../SDL_internal.h"
 #include "../../SDL_internal.h"
 
 
 #if SDL_VIDEO_DRIVER_KMSDRM
 #if SDL_VIDEO_DRIVER_KMSDRM

+ 0 - 1
src/video/kmsdrm/SDL_kmsdrmdyn.h

@@ -27,7 +27,6 @@
 #include <xf86drm.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <xf86drmMode.h>
 #include <gbm.h>
 #include <gbm.h>
-#include <EGL/egl.h>
 
 
 #ifdef __cplusplus
 #ifdef __cplusplus
 extern "C" {
 extern "C" {

+ 1 - 4
src/video/kmsdrm/SDL_kmsdrmevents.c

@@ -23,11 +23,8 @@
 
 
 #if SDL_VIDEO_DRIVER_KMSDRM
 #if SDL_VIDEO_DRIVER_KMSDRM
 
 
-#include "../../events/SDL_sysevents.h"
-#include "../../events/SDL_events_c.h"
-#include "../../events/SDL_keyboard_c.h"
 #include "SDL_kmsdrmvideo.h"
 #include "SDL_kmsdrmvideo.h"
-#include "SDL_kmsdrmevents_c.h"
+#include "SDL_kmsdrmevents.h"
 
 
 #ifdef SDL_INPUT_LINUXEV
 #ifdef SDL_INPUT_LINUXEV
 #include "../../core/linux/SDL_evdev.h"
 #include "../../core/linux/SDL_evdev.h"

+ 31 - 0
src/video/kmsdrm/SDL_kmsdrmevents.h

@@ -0,0 +1,31 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 Sam Lantinga <[email protected]>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#include "../../SDL_internal.h"
+
+#ifndef _SDL_kmsdrmevents_h
+#define _SDL_kmsdrmevents_h
+
+extern void KMSDRM_PumpEvents(_THIS);
+extern void KMSDRM_EventInit(_THIS);
+extern void KMSDRM_EventQuit(_THIS);
+
+#endif /* _SDL_kmsdrmevents_h */

+ 1 - 5
src/video/kmsdrm/SDL_kmsdrmmouse.c

@@ -18,22 +18,18 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
+
 #include "../../SDL_internal.h"
 #include "../../SDL_internal.h"
 
 
 #if SDL_VIDEO_DRIVER_KMSDRM
 #if SDL_VIDEO_DRIVER_KMSDRM
 
 
-#include "SDL_assert.h"
-#include "SDL_surface.h"
-
 #include "SDL_kmsdrmvideo.h"
 #include "SDL_kmsdrmvideo.h"
 #include "SDL_kmsdrmmouse.h"
 #include "SDL_kmsdrmmouse.h"
 #include "SDL_kmsdrmdyn.h"
 #include "SDL_kmsdrmdyn.h"
 
 
-#include "../SDL_sysvideo.h"
 #include "../../events/SDL_mouse_c.h"
 #include "../../events/SDL_mouse_c.h"
 #include "../../events/default_cursor.h"
 #include "../../events/default_cursor.h"
 
 
-
 static SDL_Cursor *KMSDRM_CreateDefaultCursor(void);
 static SDL_Cursor *KMSDRM_CreateDefaultCursor(void);
 static SDL_Cursor *KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y);
 static SDL_Cursor *KMSDRM_CreateCursor(SDL_Surface * surface, int hot_x, int hot_y);
 static int KMSDRM_ShowCursor(SDL_Cursor * cursor);
 static int KMSDRM_ShowCursor(SDL_Cursor * cursor);

+ 2 - 2
src/video/kmsdrm/SDL_kmsdrmmouse.h

@@ -19,13 +19,13 @@
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
 
 
+#include "../../SDL_internal.h"
+
 #ifndef _SDL_KMSDRM_mouse_h
 #ifndef _SDL_KMSDRM_mouse_h
 #define _SDL_KMSDRM_mouse_h
 #define _SDL_KMSDRM_mouse_h
 
 
 #include <gbm.h>
 #include <gbm.h>
 
 
-#include "../SDL_sysvideo.h"
-
 typedef struct _KMSDRM_CursorData
 typedef struct _KMSDRM_CursorData
 {
 {
     struct gbm_bo *bo;
     struct gbm_bo *bo;

+ 1 - 0
src/video/kmsdrm/SDL_kmsdrmopengles.c

@@ -18,6 +18,7 @@
      misrepresented as being the original software.
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
+
 #include "../../SDL_internal.h"
 #include "../../SDL_internal.h"
 
 
 #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL
 #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL

+ 1 - 4
src/video/kmsdrm/SDL_kmsdrmvideo.c

@@ -25,10 +25,7 @@
 
 
 /* SDL internals */
 /* SDL internals */
 #include "../SDL_sysvideo.h"
 #include "../SDL_sysvideo.h"
-#include "SDL_version.h"
 #include "SDL_syswm.h"
 #include "SDL_syswm.h"
-#include "SDL_loadso.h"
-#include "SDL_events.h"
 #include "SDL_log.h"
 #include "SDL_log.h"
 #include "../../events/SDL_mouse_c.h"
 #include "../../events/SDL_mouse_c.h"
 #include "../../events/SDL_keyboard_c.h"
 #include "../../events/SDL_keyboard_c.h"
@@ -39,7 +36,7 @@
 
 
 /* KMS/DRM declarations */
 /* KMS/DRM declarations */
 #include "SDL_kmsdrmvideo.h"
 #include "SDL_kmsdrmvideo.h"
-#include "SDL_kmsdrmevents_c.h"
+#include "SDL_kmsdrmevents.h"
 #include "SDL_kmsdrmopengles.h"
 #include "SDL_kmsdrmopengles.h"
 #include "SDL_kmsdrmmouse.h"
 #include "SDL_kmsdrmmouse.h"
 #include "SDL_kmsdrmdyn.h"
 #include "SDL_kmsdrmdyn.h"

+ 2 - 1
src/video/kmsdrm/SDL_kmsdrmvideo.h

@@ -19,10 +19,11 @@
   3. This notice may not be removed or altered from any source distribution.
   3. This notice may not be removed or altered from any source distribution.
 */
 */
 
 
+#include "../../SDL_internal.h"
+
 #ifndef __SDL_KMSDRMVIDEO_H__
 #ifndef __SDL_KMSDRMVIDEO_H__
 #define __SDL_KMSDRMVIDEO_H__
 #define __SDL_KMSDRMVIDEO_H__
 
 
-#include "../../SDL_internal.h"
 #include "../SDL_sysvideo.h"
 #include "../SDL_sysvideo.h"
 
 
 #include <fcntl.h>
 #include <fcntl.h>