AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 32bit win Vulkan build

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1781013002

Review URL: https://codereview.chromium.org/1781013002
This commit is contained in:
bsalomon 2016-03-10 12:31:20 -08:00 committed by Commit bot
parent 977c07dad2
commit a6b439a0af
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gyp/gpu.gyp
View File

@ -250,7 +250,13 @@
],
},
'link_settings': {
'library_dirs': [ '<(vulkan_sdk_path)/Bin', ],
'conditions': [
[ 'skia_arch_type == "x86"', {
'library_dirs': [ '<(vulkan_sdk_path)/Bin32', ],
}, {
'library_dirs': [ '<(vulkan_sdk_path)/Bin', ],
}],
]
},
}, {
'variables': {

6
src/gpu/vk/GrVkGpu.cpp
View File

@ -382,7 +382,8 @@ bool GrVkGpu::uploadTexData(GrVkTexture* tex,
if (trimRowBytes == rowBytes && trimRowBytes == layout.rowPitch) {
memcpy(mapPtr, data, trimRowBytes * height);
} else {
SkRectMemcpy(mapPtr, layout.rowPitch, data, rowBytes, trimRowBytes, height);
SkRectMemcpy(mapPtr, static_cast<size_t>(layout.rowPitch), data, rowBytes,
trimRowBytes, height);
}
}
@ -798,7 +799,8 @@ GrBackendObject GrVkGpu::createTestingOnlyBackendTexture(void* srcData, int w, i
if (rowCopyBytes == layout.rowPitch) {
memcpy(mapPtr, srcData, rowCopyBytes * h);
} else {
SkRectMemcpy(mapPtr, layout.rowPitch, srcData, w, rowCopyBytes, h);
SkRectMemcpy(mapPtr, static_cast<size_t>(layout.rowPitch), srcData, w, rowCopyBytes,
h);
}
GR_VK_CALL(interface, UnmapMemory(fDevice, imageRsrc->fAlloc));
} else {