Daniel Xie [Tue, 23 Feb 2016 23:02:31 +0000 (23:02 +0000)]
Merge "Remove a few texture tests from ES2 mustpass" into marshmallow-cts-dev am:
18d8b289f9
am:
6e415153e0 -s ours
* commit '
6e415153e08f2b14e74301e0c1a122b5cec76bd7':
Remove a few texture tests from ES2 mustpass
Pyry Haulos [Tue, 23 Feb 2016 22:57:39 +0000 (22:57 +0000)]
Relax uvwBits to 3 in dEQP-GLES2.functional.texture.filtering.cube am:
f1c8ff1f20
am:
87d86cc382
* commit '
87d86cc3820b8d06705978a48239ae08911e90c3':
Relax uvwBits to 3 in dEQP-GLES2.functional.texture.filtering.cube
Daniel Xie [Tue, 23 Feb 2016 22:21:28 +0000 (22:21 +0000)]
Merge "Remove a few texture tests from ES2 mustpass" into marshmallow-cts-dev
am:
18d8b289f9
* commit '
18d8b289f97e87678949364307f318dc7ca5a5c1':
Remove a few texture tests from ES2 mustpass
Pyry Haulos [Tue, 23 Feb 2016 22:21:20 +0000 (22:21 +0000)]
Relax uvwBits to 3 in dEQP-GLES2.functional.texture.filtering.cube
am:
f1c8ff1f20
* commit '
f1c8ff1f204f50ae1c785ef361fb88cc7dc611ef':
Relax uvwBits to 3 in dEQP-GLES2.functional.texture.filtering.cube
Daniel Xie [Tue, 23 Feb 2016 22:14:23 +0000 (22:14 +0000)]
Merge "Remove a few texture tests from ES2 mustpass" into marshmallow-cts-dev
Pyry Haulos [Mon, 22 Feb 2016 21:21:20 +0000 (13:21 -0800)]
Merge in fixes from Khronos Vulkan CTS repo
Mika Isojarvi [Mon, 22 Feb 2016 19:09:14 +0000 (19:09 +0000)]
Merge "Add multicontext creation tests for EGL." into nyc-dev
Pyry Haulos [Mon, 22 Feb 2016 18:49:28 +0000 (10:49 -0800)]
Re-generate Android mustpass files
Change-Id: I2fc88bb0a46e6b138a735c74856836803ec8ddc1
Pyry Haulos [Mon, 22 Feb 2016 18:44:18 +0000 (10:44 -0800)]
Merge in new OpenGL ES 3.2 test code
Change-Id: I8667c03f0d1eb4b212bc33b54296336633fb39da
Mika Isojärvi [Thu, 18 Feb 2016 19:09:26 +0000 (11:09 -0800)]
Add multicontext creation tests for EGL.
Bug:
24290416
Change-Id: Ibaf7abc8a70249891aed8ea32ab21538cdccb419
Mika Isojärvi [Fri, 19 Feb 2016 23:11:45 +0000 (15:11 -0800)]
Add native window resizing to swap buffers with damage tests
Bug:
27171356
Change-Id: I190acf09004b5b6e846dfce791facefbaa3a4db4
Mika Isojarvi [Mon, 22 Feb 2016 18:10:41 +0000 (18:10 +0000)]
Merge "Add native window resizing to buffer age tests" into nyc-dev
Pyry Haulos [Mon, 22 Feb 2016 18:09:19 +0000 (10:09 -0800)]
Merge vulkan-cts-1.0 to master
Pyry Haulos [Mon, 22 Feb 2016 17:35:10 +0000 (12:35 -0500)]
Merge branch 'memory-barrier-fix' into 'vulkan-cts-1.0'
Fix issues with memory barrier tests.
There are multiple issues currently in the dEQP-VK.memory.pipeline_barrier.* tests.
I found 3 ocasions where the values provided to srcAccessMask and dstAccessMask are the other way around.
In particular, after a transfer operation the barrier responsible for flushing the output of the transfer writes uses srcAccessMask=0 and dstAccessMask=VK_ACCESS_TRANSFER_WRITE_BIT, when actually VK_ACCESS_TRANSFER_WRITE_BIT should have been set in srcAccessMask not in dstAccessMask.
See merge request !421
Mika Isojärvi [Fri, 19 Feb 2016 23:04:14 +0000 (15:04 -0800)]
Add native window resizing to buffer age tests
Bug:
27171356
Change-Id: Ie63cc517557e8d878b290b7a9744b4e31ecd2995
Mika Isojärvi [Fri, 19 Feb 2016 21:59:13 +0000 (13:59 -0800)]
Skip negative alignment check when alignment is 1
Skip uniform buffer negative alignment check when alignment is 1 since there
are no possible invalid values.
Bug:
27270184
Change-Id: I33f1b51c312cfe2ecc6ccf0f3b0b994385724b1d
Mika Isojarvi [Fri, 19 Feb 2016 20:57:29 +0000 (20:57 +0000)]
Merge "Improve egluNativeDisplay." into nyc-dev
Mika Isojarvi [Fri, 19 Feb 2016 20:54:50 +0000 (20:54 +0000)]
Merge "Add missing getPlatformAttributes() method to X11 EGL platform." into nyc-dev
Mika Isojärvi [Fri, 19 Feb 2016 19:49:55 +0000 (11:49 -0800)]
Improve egluNativeDisplay.
- Properly throw NotSupportedError() in all methods that
implementation doesn't support.
- Add comments to better describe when InternalError is thrown.
Change-Id: I614da6793716d3a592089e863a87d2211f5811db
Mika Isojärvi [Fri, 19 Feb 2016 19:45:41 +0000 (11:45 -0800)]
Add missing getPlatformAttributes() method to X11 EGL platform.
Bug:
27265778
Change-Id: I77d3fc1333826d269a4bea21cbf672d2b7ecb2e4
Mika Isojärvi [Thu, 18 Feb 2016 19:57:21 +0000 (11:57 -0800)]
Add timeout to eglClientWaitSync() tests.
Require that eglClientWaitSync() with timeout 0 and without rendering
anything finishes in 100us.
Bug:
18183346
Change-Id: Id1c8e9793cb96a95022f2d051a7b27ac03e92f53
Mika Isojarvi [Fri, 19 Feb 2016 16:13:15 +0000 (16:13 +0000)]
Merge "Remove unnecessary current context from reusable sync tests" into nyc-dev
Mika Isojärvi [Wed, 17 Feb 2016 23:21:00 +0000 (15:21 -0800)]
Fix EGLImage format compatibility check.
Bug:
27224316
Change-Id: I5fa4288379a620c0cd36a8a2fd93d7868857812c
Mika Isojarvi [Thu, 18 Feb 2016 22:08:59 +0000 (22:08 +0000)]
Merge "Report QualityWarning if resize doesn't crop image to corner." into nyc-dev
Mika Isojärvi [Thu, 18 Feb 2016 20:40:30 +0000 (12:40 -0800)]
Remove unnecessary current context from reusable sync tests
Bug:
19872165
Change-Id: Icdbcdb58d0a557b7ba69f823448d0926ea0089a6
Pyry Haulos [Thu, 18 Feb 2016 12:19:40 +0000 (04:19 -0800)]
Remove a few texture tests from ES2 mustpass
These tests produce false negatives on certain platforms and use image
comparison method that can't be trivially relaxed to allow the
comparison to pass.
Bug:
27101650
Change-Id: Ibaf7ee4aafee51ee2ecbcb88453f3451f258dee2
Pyry Haulos [Thu, 18 Feb 2016 12:13:29 +0000 (04:13 -0800)]
Relax uvwBits to 3 in dEQP-GLES2.functional.texture.filtering.cube
Bug:
27101650
Change-Id: Icf0f0ccbb176df5e71521ea9b6be273f3c648950
Mika Isojärvi [Wed, 17 Feb 2016 22:20:00 +0000 (14:20 -0800)]
Report QualityWarning if resize doesn't crop image to corner.
Bug:
27170794
Change-Id: Ie52566d92ef4f3185e2baf6bb260c72bd92736bc
Ying Wang [Tue, 16 Feb 2016 23:44:03 +0000 (15:44 -0800)]
LOCAL_COMPATIBILITY_SUPPORT_FILES relative to $(TOP).
Change-Id: Ic90955086b436411531b60b84b376c4cb49ee5d6
(cherry picked from commit
5072ce1021d700853deb7dee90dfc1adcc6cec1f)
aqnuep [Wed, 17 Feb 2016 14:06:56 +0000 (15:06 +0100)]
Fix issues with memory barrier tests.
Pyry Haulos [Tue, 16 Feb 2016 15:32:40 +0000 (17:32 +0200)]
Merge branch 'vulkan-cts-1.0'
Pyry Haulos [Mon, 15 Feb 2016 12:36:29 +0000 (04:36 -0800)]
Fix type conversion warnings
Csaba Osztrogonác [Fri, 12 Feb 2016 15:15:45 +0000 (16:15 +0100)]
Bump #version to 310 in vktApiSmokeTests.cpp
fixes #272
Pyry Haulos [Tue, 16 Feb 2016 15:16:56 +0000 (17:16 +0200)]
Update glslang and spirv-tools in fetch_sources.py to public versions
Pyry Haulos [Mon, 15 Feb 2016 12:36:29 +0000 (04:36 -0800)]
Fix type conversion warnings
Pyry Haulos [Mon, 15 Feb 2016 12:21:54 +0000 (04:21 -0800)]
Merge in changes from Khronos Vulkan CTS repo
Pyry Haulos [Mon, 15 Feb 2016 11:45:52 +0000 (06:45 -0500)]
Merge branch '286-extend-device-feature-limit-validation' into 'master'
Extend device feature and limit validation in dEQP-VK.api.info
Fixes #286
See merge request !423
Pyry Haulos [Mon, 15 Feb 2016 11:43:23 +0000 (06:43 -0500)]
Merge branch '292-use-spirv-tools-to-create-disassembly' into 'master'
disassembleSpirV should use spirv-tools instead of glslang
Fixes #292
See merge request !427
Pyry Haulos [Mon, 15 Feb 2016 11:42:04 +0000 (06:42 -0500)]
Merge branch '292-update-glslang' into 'master'
Update glslang
This is a dependency of #292.
We need a glslang fix to avoid header clashing between glslang and spirv-tools: glslang commit
f947debf70f626ab2fd9dd1339be5f3d1ce8c671
Let's bump to the latest KHR_vulkan_glsl revision:
6060845a36bfeed28357942b93335b29642c99cb
See merge request !440
Pyry Haulos [Mon, 15 Feb 2016 11:40:51 +0000 (06:40 -0500)]
Merge branch '272-bump-version-to-310' into 'master'
Bump #version to 310 in vktApiSmokeTests.cpp
fixes #272
See merge request !439
Pyry Haulos [Fri, 12 Feb 2016 18:51:57 +0000 (10:51 -0800)]
Merge in changes from Khronos Vulkan CTS repo
Mika Isojarvi [Fri, 12 Feb 2016 18:23:48 +0000 (18:23 +0000)]
Merge "Add Vulkan support to DeqpTestRunner and mustpass script." into nyc-dev
Mika Isojarvi [Fri, 12 Feb 2016 18:19:19 +0000 (18:19 +0000)]
Merge "Add Vulkan assets to apk when building for Android CTS." into nyc-dev
Csaba Osztrogonác [Fri, 12 Feb 2016 17:58:16 +0000 (18:58 +0100)]
disassembleSpirV should use spirv-tools instead of glslang
fixes #292
Pyry Haulos [Fri, 12 Feb 2016 17:44:04 +0000 (12:44 -0500)]
Merge branch 'aosp-copyright' into 'vulkan-cts-1.0'
Add AOSP copyright to tests ported from dEQP GLES tests
See merge request !436
Csaba Osztrogonác [Fri, 12 Feb 2016 17:43:40 +0000 (18:43 +0100)]
Update glslang
Mika Isojärvi [Thu, 4 Feb 2016 23:35:09 +0000 (15:35 -0800)]
Add Vulkan support to DeqpTestRunner and mustpass script.
Change-Id: Ib578fce85c8a817543816c07681d0bc4e15c4489
Pyry Haulos [Fri, 12 Feb 2016 17:24:48 +0000 (12:24 -0500)]
Merge branch '305-fix-access-flags' into 'vulkan-cts-1.0'
Fix for dEQP-VK.image.load_store* lacks setting access flags for image memory barrier
Fixes #305
See merge request !438
Mika Isojarvi [Fri, 12 Feb 2016 16:42:15 +0000 (16:42 +0000)]
Merge "Remove extension cache from glu::ContextInfo." into nyc-dev
Mika Isojarvi [Fri, 12 Feb 2016 16:42:03 +0000 (16:42 +0000)]
Merge "Remove native pixmap matching rule since it can't be queried." into nyc-dev
Csaba Osztrogonác [Fri, 12 Feb 2016 15:15:45 +0000 (16:15 +0100)]
Bump #version to 310 in vktApiSmokeTests.cpp
fixes #272
Kantoch [Fri, 12 Feb 2016 14:22:33 +0000 (15:22 +0100)]
dEQP-VK.image.load_store* lacks setting access flags for image memory barrier
Mika Isojärvi [Fri, 12 Feb 2016 00:19:58 +0000 (16:19 -0800)]
Remove extension cache from glu::ContextInfo.
Bug:
27127958
Change-Id: Ia1765b7617023bc3bc3235183ce09675e2c9583a
Mika Isojärvi [Fri, 12 Feb 2016 00:06:17 +0000 (16:06 -0800)]
Remove native pixmap matching rule since it can't be queried.
Bug:
27124527
Change-Id: I9210d0eee2356a592f75e5f7cdeb61285823b061
Mika Isojärvi [Thu, 11 Feb 2016 23:35:19 +0000 (15:35 -0800)]
Add version 0.3.4 parsing support to xeTestResultParser.
Change-Id: I9bb025d6e9b435d9d6fc36a88f5822cdbb458ce0
Mika Isojärvi [Thu, 11 Feb 2016 21:59:46 +0000 (13:59 -0800)]
Add Vulkan assets to apk when building for Android CTS.
Change-Id: Ib8c757b3e01444ef5e112dadc0c2ff835bbbd46f
Pyry Haulos [Thu, 11 Feb 2016 21:39:09 +0000 (13:39 -0800)]
Add AOSP copyright to tests ported from dEQP GLES tests
Pyry Haulos [Thu, 11 Feb 2016 20:21:42 +0000 (15:21 -0500)]
Merge branch '259-fix-arm-gcc-issue' into 'vulkan-cts-1.0'
Image load/store: remove DynArray
As per description in #259 this code posed a problem in some situations, so this is an attempt to sidestep an issue altogether.
Fixes #259
See merge request !419
Pyry Haulos [Thu, 11 Feb 2016 17:46:17 +0000 (12:46 -0500)]
Merge branch 'fix-290-291-ds-advanced' into 'vulkan-cts-1.0'
Fix dEQP-VK.dynamic_state.ds_state.stencil_params_advanced #290, #291
- Add missing barriers to ensure fragment loads wait
- Add LOAD_OP_LOAD for stencil aspect as the data is always needed
- Add TRANSFER_DST usage bit for both color and depth-stencil, as images are target of vmCmdClear* operations
Change-Id: Ia01304fb5287698ffbbd493cc800ef78a820a82c
See merge request !432
Pyry Haulos [Thu, 11 Feb 2016 17:45:17 +0000 (12:45 -0500)]
Merge branch '289-renderpass-formats' into 'vulkan-cts-1.0'
Round quad coordinates in dEQP-VK.renderpass.formats.* to pixel edges.
Round the (-0.5,-0.5) - (0.5,0.5) quad coordinates to pixel edges, to fix #289.
See merge request !430
Michael Stokes [Tue, 9 Feb 2016 13:50:40 +0000 (14:50 +0100)]
Round quad coordinates in dEQP-VK.renderpass.formats.* to pixel edges.
Fixes #289
Pyry Haulos [Thu, 11 Feb 2016 17:39:25 +0000 (12:39 -0500)]
Merge branch '295-fix-glsl-discard-missing-barriers' into 'vulkan-cts-1.0'
Fix for dEQP-VK.glsl.discard.* missing barriers
ShaderRender is missing the appropriate barriers before and after cmdCopyImageToBuffer
See merge request !434
Joerg Wagner [Tue, 9 Feb 2016 19:57:17 +0000 (20:57 +0100)]
Fix dEQP-VK.dynamic_state.ds_state.stencil_params_advanced
- Add missing barriers to ensure fragment loads for color and ds wait
- Add LOAD_OP_LOAD for stencil aspect as the data is always needed
- Add TRANSFER_DST usage bit for both color and depth-stencil, as images are target of vmCmdClear* operations
Change-Id: Ia01304fb5287698ffbbd493cc800ef78a820a82c
Pyry Haulos [Wed, 10 Feb 2016 21:49:16 +0000 (13:49 -0800)]
Remove header snippets from Vulkan API test plan
Mais Alnasser [Wed, 10 Feb 2016 20:08:15 +0000 (15:08 -0500)]
ShaderRender is missing the appropriate barriers before and after cmdCopyImageToBuffer
Pyry Haulos [Wed, 10 Feb 2016 20:45:07 +0000 (12:45 -0800)]
Add top-level README
Pyry Haulos [Wed, 10 Feb 2016 18:45:26 +0000 (10:45 -0800)]
Merge master into nyc-dev
Pyry Haulos [Wed, 10 Feb 2016 18:18:02 +0000 (13:18 -0500)]
Merge branch 'remove-confidentiality-clause' into 'vulkan-cts-1.0'
Remove confidentiality clause from Vulkan CTS license
See merge request !433
Pyry Haulos [Tue, 9 Feb 2016 20:49:00 +0000 (12:49 -0800)]
Remove confidentiality clause from Vulkan CTS license
Pyry Haulos [Fri, 5 Feb 2016 22:06:44 +0000 (14:06 -0800)]
Extend device feature and limit validation in dEQP-VK.api.info
Fixes #286
Pyry Haulos [Tue, 9 Feb 2016 18:49:14 +0000 (10:49 -0800)]
Fix deUint32 -> deUint8 conversion warning
Change-Id: I7a5c9570781edc07299f66ac8c1be08266731ea1
Pyry Haulos [Tue, 9 Feb 2016 18:40:59 +0000 (10:40 -0800)]
Merge in changes from Khronos Vulkan CTS repository
Pyry Haulos [Tue, 9 Feb 2016 18:30:47 +0000 (13:30 -0500)]
Merge branch '274-remove-round-mustpass' into 'vulkan-cts-1.0'
Remove rounding tests from the mustpass list
See merge request !429
Pyry Haulos [Tue, 9 Feb 2016 18:29:53 +0000 (13:29 -0500)]
Merge branch '283-reset-query-pool-before-use' into 'vulkan-cts-1.0'
Add missing commands for reseting queryPool prior to use
Fixes #283
See merge request !428
Pyry Haulos [Tue, 9 Feb 2016 18:29:06 +0000 (13:29 -0500)]
Merge branch 'origin/280-move_vkCmdCopyQueryPoolResults_outside_renderpass' into 'vulkan-cts-1.0'
#280: End the renderpass before trying to copy the query results
End the renderpass before trying to copy the query results,
as vkCmdCopyQueryPoolResults is only allowed outside.
Fixes #280.
See merge request !424
Peter Gal [Tue, 9 Feb 2016 10:58:49 +0000 (11:58 +0100)]
Remove rounding tests from the mustpass list
Maciej Jesionowski [Fri, 5 Feb 2016 10:34:18 +0000 (11:34 +0100)]
Compute, image: remove DynArray
Pyry Haulos [Mon, 8 Feb 2016 23:07:48 +0000 (15:07 -0800)]
Merge in code from gles32-dev
Change-Id: Id3b56b345c8062ca0a79e01f7e2d943dd53672bb
Pyry Haulos [Mon, 8 Feb 2016 23:06:23 +0000 (23:06 +0000)]
Merge "Select shader version appropriate for context." into gles32-dev
Pyry Haulos [Mon, 8 Feb 2016 23:05:48 +0000 (23:05 +0000)]
Merge "Add support for OpenGL ES 3.2 features." into gles32-dev
Pyry Haulos [Mon, 8 Feb 2016 19:09:06 +0000 (14:09 -0500)]
Merge branch '287-puniq' into 'vulkan-cts-1.0'
Make buffer-pointer types unique. Fixes #287
See merge request !425
Dejan Mircevski [Mon, 8 Feb 2016 18:50:51 +0000 (18:50 +0000)]
Merge "Log SPIR-V assembly source."
Dejan Mircevski [Mon, 8 Feb 2016 15:23:49 +0000 (10:23 -0500)]
Log SPIR-V assembly source.
We weren't previously logging the source of a SPIR-V module, which made
it hard to debug compilation errors.
Extend executor to handle the new XML element.
Bump the log-format version to 0.3.4.
Change-Id: I4ace0a88820d08febd0500c60d1f2fe97b635635
Szilard Ledan [Mon, 8 Feb 2016 16:08:27 +0000 (17:08 +0100)]
Add missing commands for reseting queryPool prior to use
Dejan Mircevski [Sun, 7 Feb 2016 22:32:27 +0000 (17:32 -0500)]
Make buffer-pointer types unique.
Joerg Wagner [Sun, 7 Feb 2016 12:54:37 +0000 (13:54 +0100)]
End the renderpass before trying to copy the query results, as
vkCmdCopyQueryPoolResults is only allowed outside.
Change-Id: I07cdd6c056017418f5080bdabb56746daeea73e7
Daniel Andrade Groppe [Fri, 5 Feb 2016 18:56:45 +0000 (12:56 -0600)]
Select shader version appropriate for context.
Change-Id: I42552ac8487eab0d0c2ea9c744a972c97cc4c3a5
Daniel Andrade Groppe [Fri, 5 Feb 2016 18:49:54 +0000 (12:49 -0600)]
Add support for OpenGL ES 3.2 features.
- Increase range to GLSL_VERSION_320_ES.
- Add new types:
- {i u}samplerBuffer
- {i u}sampler2DMSArray
- {i u}imageBuffer
Change-Id: Idd4a3a6ea19fc7ce4e3efef5b018b5072b219553
Daniel Andrade Groppe [Fri, 5 Feb 2016 19:24:18 +0000 (13:24 -0600)]
Add support for OpenGL ES 3.2 features.
- Specialize shaders for context version.
- Check context version along with extension support.
Change-Id: I16c57def58fe92cae9d4b8a20dafd73c3d63aace
Mika Isojärvi [Fri, 5 Feb 2016 18:57:39 +0000 (10:57 -0800)]
Update Android mustpass build script copyright header.
Change-Id: I8c7ab0b2054e32f1efc92281db850fa1bee3a629
Pyry Haulos [Fri, 5 Feb 2016 16:33:29 +0000 (11:33 -0500)]
Merge branch '277-log-original-assembly-of-SPIRV-assembly-tests' into 'master'
Add original assembly of the SPIR-V assembly tests to the log
fixes #277
Old MR: !416 (I had to create a new MR one because of renaming the branch.)
See merge request !420
Csaba Osztrogonác [Fri, 5 Feb 2016 11:03:45 +0000 (12:03 +0100)]
Add original assembly of the SPIR-V assembly tests to the log
fixes #277
Pyry Haulos [Thu, 4 Feb 2016 21:26:18 +0000 (16:26 -0500)]
Merge branch '278-proposed_texcoord_offset_is_too_low_fix' into 'vulkan-cts-1.0'
Fixes #278
Pyry Haulos [Thu, 4 Feb 2016 21:24:33 +0000 (16:24 -0500)]
Merge branch '276-fix-incorrect-buffer-usage-flag' into 'vulkan-cts-1.0'
dEQP-VK.compute.basic.shared_atomic_op* fix incorrect usage flag
Fixes #276
See merge request !418
Mika Isojarvi [Thu, 4 Feb 2016 19:09:37 +0000 (19:09 +0000)]
Merge "Don't require surfaceless context in negative partial update tests."
Mika Isojarvi [Thu, 4 Feb 2016 19:09:27 +0000 (19:09 +0000)]
Merge "Fix uniform precision qualifier mismatch in GLES3 conditional tests."
Mika Isojärvi [Thu, 4 Feb 2016 18:25:32 +0000 (10:25 -0800)]
Don't require surfaceless context in negative partial update tests.
Split tests requiring surfaceless context to three different cases
with surfaceless context, no surface and no context and different
surface.
Bug:
26978632
Change-Id: I313891236b2c8af7d97bc277e7a6f45ea51dfdc5
Maciej Jesionowski [Thu, 4 Feb 2016 17:24:18 +0000 (18:24 +0100)]
dEQP-VK.compute.basic.shared_atomic_op* fix incorrect usage flag
Dominik Witczak [Thu, 4 Feb 2016 12:32:05 +0000 (13:32 +0100)]
Increase texcoord offset used by pipeline.sampler conformance tests from 0.001 to 0.002
Mika Isojarvi [Thu, 4 Feb 2016 01:05:13 +0000 (01:05 +0000)]
Merge "Fix compiler warnings when converting png_uint_32 to deUint32."