1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QVulkanInstance: Fix compilation with MSVC2013

Browse Source 
Use assignment. Fixes:

vulkan\qvulkaninstance.cpp(811) : error C2061: syntax error : identifier 'd_ptr'
vulkan\qvulkaninstance.cpp(812) : warning C4551: function call missing argument list
vulkan\qvulkaninstance.cpp(813) : error C2659: '=' : function as left operand
vulkan\qvulkaninstance.cpp(814) : error C2440: 'return' : cannot convert from 'QVulkanDeviceFunctions *&(__cdecl *)(void)' to 'QVulkanDeviceFunctions *'
        There is no context in which this conversion is possible
vulkan\qvulkaninstance.cpp(832) : error C2061: syntax error : identifier 'd_ptr'
vulkan\qvulkaninstance.cpp(833) : error C2541: 'delete' : cannot delete objects that are not pointers
vulkan\qvulkaninstance.cpp(834) : error C2659: '=' : function as left operand

Change-Id: I859b141aa0cb24b1f85dc9f229262a4145651d7c
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Friedemann Kleint 2017-10-13 15:01:17 +02:00
parent d4ea12e260
commit 015a4bb2f1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/vulkan/qvulkaninstance.cpp
View File

@ -808,7 +808,7 @@ QVulkanFunctions *QVulkanInstance::functions() const
*/ */
QVulkanDeviceFunctions *QVulkanInstance::deviceFunctions(VkDevice device) QVulkanDeviceFunctions *QVulkanInstance::deviceFunctions(VkDevice device)
{ {
QVulkanDeviceFunctions *&f(d_ptr->deviceFuncs[device]); QVulkanDeviceFunctions *&f = d_ptr->deviceFuncs[device];
if (!f) if (!f)
f = new QVulkanDeviceFunctions(this, device); f = new QVulkanDeviceFunctions(this, device);
return f; return f;
@ -829,7 +829,7 @@ QVulkanDeviceFunctions *QVulkanInstance::deviceFunctions(VkDevice device)
*/ */
void QVulkanInstance::resetDeviceFunctions(VkDevice device) void QVulkanInstance::resetDeviceFunctions(VkDevice device)
{ {
QVulkanDeviceFunctions *&f(d_ptr->deviceFuncs[device]); QVulkanDeviceFunctions *&f = d_ptr->deviceFuncs[device];
delete f; delete f;
f = nullptr; f = nullptr;
} }