rooty/rpi-vk-driver
1
0
Fork 0
mirror of https://github.com/Yours3lf/rpi-vk-driver.git synced 2025-02-19 16:54:18 +01:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Unknown 2018-09-29 15:59:47 +01:00
parent 9f3d3de52f
commit c15e06358e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
driver/common.c
View File

@ -603,23 +603,23 @@ void vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t ins
//emit shader record
ControlListAddress fragCode = {
.handle = (_shaderModule*)(cb->graphicsPipeline->modules[VK_SHADER_STAGE_FRAGMENT_BIT])->bos[VK_RPI_ASSEMBLY_TYPE_FRAGMENT],
.handle = ((_shaderModule*)(cb->graphicsPipeline->modules[VK_SHADER_STAGE_FRAGMENT_BIT]))->bos[VK_RPI_ASSEMBLY_TYPE_FRAGMENT],
.offset = 0,
};
ControlListAddress vertCode = {
.handle = (_shaderModule*)(cb->graphicsPipeline->modules[VK_SHADER_STAGE_VERTEX_BIT])->bos[VK_RPI_ASSEMBLY_TYPE_VERTEX],
.handle = ((_shaderModule*)(cb->graphicsPipeline->modules[VK_SHADER_STAGE_VERTEX_BIT]))->bos[VK_RPI_ASSEMBLY_TYPE_VERTEX],
.offset = 0,
};
ControlListAddress coordCode = {
.handle = (_shaderModule*)(cb->graphicsPipeline->modules[VK_SHADER_STAGE_VERTEX_BIT])->bos[VK_RPI_ASSEMBLY_TYPE_COORDINATE],
.handle = ((_shaderModule*)(cb->graphicsPipeline->modules[VK_SHADER_STAGE_VERTEX_BIT]))->bos[VK_RPI_ASSEMBLY_TYPE_COORDINATE],
.offset = 0,
};
//TODO
clFit(commandBuffer, &commandBuffer->shaderRecCl, V3D21_SHADER_RECORD_length);
clInsertShaderRecord(commandBuffer->shaderRecCl,
clInsertShaderRecord(&commandBuffer->shaderRecCl,
0, //single threaded?
0, //point size included in shaded vertex data?
0, //enable clipping?
@ -645,7 +645,7 @@ void vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t ins
};
clFit(commandBuffer, &commandBuffer->shaderRecCl, V3D21_ATTRIBUTE_RECORD_length);
clInsertAttributeRecord(commandBuffer->shaderRecCl,
clInsertAttributeRecord(&commandBuffer->shaderRecCl,
vertexBuffer, //address
getFormatByteSize(cb->graphicsPipeline->vertexAttributeDescriptions[0].format),
cb->graphicsPipeline->vertexBindingDescriptions[0].stride, //stride
@ -935,7 +935,6 @@ VkResult vkCreateShaderModuleFromRpiAssemblyKHR(VkDevice device, VkRpiShaderModu
assert(pShaderModule);
assert(pCreateInfo->byteStreamArray);
assert(pCreateInfo->numBytesArray);
assert(pCreateInfo->arraySize > 0);
assert(pAllocator == 0); //TODO

4
driver/vkExt.h
View File

@ -31,8 +31,8 @@ typedef struct VkRpiSurfaceCreateInfoKHR {
typedef struct VkRpiShaderModuleAssemblyCreateInfoKHR {
VkStructureType sType;
const void* pNext;
char* byteStreamArray[VK_RPI_ASSEMBLY_TYPE_MAX];
uint32_t numBytesArray[VK_RPI_ASSEMBLY_TYPE_MAX];
char** byteStreamArray;
uint32_t* numBytesArray;
} VkRpiShaderModuleAssemblyCreateInfoKHR;
//extension name something like: VK_KHR_rpi_surface