public-backup/Boxedwine
1
0
Fork 0
mirror of https://github.com/danoon2/Boxedwine.git synced 2025-12-05 18:46:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

removed another 2 deletes of void* in vulkan.

Browse Source
This commit is contained in:
James Bryant
2025-02-28 19:16:14 -08:00
parent e2c5c13b8b
commit f92c5119b6
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/vulkan/vk_host_marshal.cpp
View File

@@ -2357,7 +2357,7 @@ void MarshalVkPipelineBinaryDataKHR::write(BoxedVulkanInfo* pBoxedInfo, KMemory*
}
}
MarshalVkPipelineBinaryDataKHR::~MarshalVkPipelineBinaryDataKHR() {
delete[] s.pData;
delete[] (char*)s.pData;
}
void MarshalVkPipelineBinaryKeysAndDataKHR::read(BoxedVulkanInfo* pBoxedInfo, KMemory* memory, U32 address, VkPipelineBinaryKeysAndDataKHR* s) {
s->binaryCount = (uint32_t)memory->readd(address);address+=4;
@@ -13418,7 +13418,7 @@ void MarshalVkPipelineExecutableInternalRepresentationKHR::write(BoxedVulkanInfo
}
MarshalVkPipelineExecutableInternalRepresentationKHR::~MarshalVkPipelineExecutableInternalRepresentationKHR() {
delete (VkBaseOutStructure*)s.pNext;
delete[] s.pData;
delete[] (char*)s.pData;
}
void MarshalVkPhysicalDeviceShaderDemoteToHelperInvocationFeatures::read(BoxedVulkanInfo* pBoxedInfo, KMemory* memory, U32 address, VkPhysicalDeviceShaderDemoteToHelperInvocationFeatures* s) {
s->sType = (VkStructureType)memory->readd(address);address+=4;

8
tools/vulkan/gen/src/boxedwine/org/marshal/VkHostMarshalType.java
View File

@@ -24,6 +24,7 @@ public class VkHostMarshalType {
boolean deleteItems = false;
String itemCount;
boolean unlock = false;
boolean isVoid = false;
}
public static void writeHeader(VkType t, StringBuilder out) throws Exception {
@@ -245,10 +246,12 @@ public class VkHostMarshalType {
}
out.append("new ");
paramData.add(new MarshalParamData("s."+param.name, true));
MarshalParamData data = new MarshalParamData("s."+param.name, true);
paramData.add(data);
if (param.paramType.name.equals("void")) {
if (param.isPointer) {
out.append("char");
data.isVoid = true;
} else {
throw new Exception("oops");
}
@@ -1099,6 +1102,9 @@ public class VkHostMarshalType {
out.append("[]");
}
out.append(" ");
if (data.isVoid) {
out.append("(char*)");
}
if (data.name.equals("s.pNext")) {
out.append("(VkBaseOutStructure*)");
}