projects
/
platform
/
upstream
/
SDL.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8e13a81
5caec9f
)
Merge "[Tizen] add vulkan local header" into tizen
author
Wonsik, Jung
<sidein@samsung.com>
Thu, 22 Dec 2016 12:42:24 +0000
(
04:42
-0800)
committer
Gerrit Code Review
<gerrit@review.vlan103.tizen.org>
Thu, 22 Dec 2016 12:42:24 +0000
(
04:42
-0800)
1
2
src/video/tizen/SDL_ecore_ipc.c
patch
|
diff1
|
diff2
|
blob
|
history
src/video/tizen/SDL_tizenvulkan.c
patch
|
diff1
|
diff2
|
blob
|
history
src/video/tizen/SDL_tizenwindow.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/video/tizen/SDL_ecore_ipc.c
Simple merge
diff --cc
src/video/tizen/SDL_tizenvulkan.c
index
f4d0897
,
92ed090
..
8aed194
---
1
/
src/video/tizen/SDL_tizenvulkan.c
---
2
/
src/video/tizen/SDL_tizenvulkan.c
+++ b/
src/video/tizen/SDL_tizenvulkan.c
@@@
-32,8
-30,8
+30,9
@@@
#include "SDL_tizenwindow.h"
#include "SDL_tizenvideo.h"
#include "SDL_tizenvulkan.h"
+#include "SDL_log.h"
+ #if SDL_VIDEO_VULKAN
#define DEFAULT_VULKAN "libvulkan.so"
#define LOAD_FUNC(NAME) \
diff --cc
src/video/tizen/SDL_tizenwindow.c
Simple merge