projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1150f43
9b0f8d4
)
Merge vk-gl-cts-public/master into aosp/deqp-dev
author
Mika Isojärvi
<misojarvi@google.com>
Mon, 7 Aug 2017 21:32:43 +0000
(14:32 -0700)
committer
Mika Isojärvi
<misojarvi@google.com>
Mon, 7 Aug 2017 21:42:40 +0000
(14:42 -0700)
Change-Id: I48249f54d401d1dc8668690f9f30c6d5f57ab642
1
2
AndroidGen.mk
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/api/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
framework/egl/wrapper/eglwEnums.inl
patch
|
diff1
|
diff2
|
blob
|
history
framework/egl/wrapper/eglwEnumsC.inl
patch
|
diff1
|
diff2
|
blob
|
history
scripts/egl/common.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
AndroidGen.mk
Simple merge
diff --cc
external/vulkancts/modules/vulkan/api/CMakeLists.txt
index
8a461c5
,
ab44b98
..
5c94ee7
---
1
/
external/vulkancts/modules/vulkan/api/CMakeLists.txt
---
2
/
external/vulkancts/modules/vulkan/api/CMakeLists.txt
+++ b/
external/vulkancts/modules/vulkan/api/CMakeLists.txt
@@@
-46,9
-46,9
+46,10
@@@
set(DEQP_VK_API_SRC
)
set(DEQP_VK_API_LIBS
+ deqp-vk-package
tcutil
vkutil
+ deqp-vk-package
)
add_library(deqp-vk-api STATIC ${DEQP_VK_API_SRCS})
diff --cc
framework/egl/wrapper/eglwEnums.inl
Simple merge
diff --cc
framework/egl/wrapper/eglwEnumsC.inl
Simple merge
diff --cc
scripts/egl/common.py
Simple merge