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

built-in uniforms now written

Browse Source
This commit is contained in:
Unknown 2018-10-14 16:34:24 +01:00
parent 25c1b9b2f3
commit 6fd2b3f34a
3 changed files with 67 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
driver/ControlListUtil.c
View File

@ -34,7 +34,6 @@ uint32_t clHasEnoughSpace(ControlList* cl, uint32_t size)
} }
} }
void clInit(ControlList* cl, void* buffer) void clInit(ControlList* cl, void* buffer)
{ {
assert(cl); assert(cl);
@ -44,6 +43,27 @@ void clInit(ControlList* cl, void* buffer)
cl->nextFreeByte = &cl->buffer[0]; cl->nextFreeByte = &cl->buffer[0];
} }
void clInsertUniformConstant(ControlList* cl, uint32_t data)
{
assert(cl);
*(uint32_t*)cl->nextFreeByte = data;
cl->nextFreeByte += 4;
}
void clInsertUniformXYScale(ControlList* cl, float data)
{
assert(cl);
*(float*)cl->nextFreeByte = data;
cl->nextFreeByte += 4;
}
void clInsertUniformZOffset(ControlList* cl, float data)
{
assert(cl);
*(float*)cl->nextFreeByte = data;
cl->nextFreeByte += 4;
}
void clInsertHalt(ControlList* cl) void clInsertHalt(ControlList* cl)
{ {
assert(cl); assert(cl);

3
driver/ControlListUtil.h
View File

@ -36,6 +36,9 @@ uint32_t moveBits(uint32_t d, uint32_t bits, uint32_t offset);
uint32_t clSize(ControlList* cl); uint32_t clSize(ControlList* cl);
uint32_t clHasEnoughSpace(ControlList* cl, uint32_t size); uint32_t clHasEnoughSpace(ControlList* cl, uint32_t size);
void clInit(ControlList* cl, void* buffer); void clInit(ControlList* cl, void* buffer);
void clInsertUniformConstant(ControlList* cl, uint32_t data);
void clInsertUniformXYScale(ControlList* cl, float data);
void clInsertUniformZOffset(ControlList* cl, float data);
void clInsertHalt(ControlList* cl); void clInsertHalt(ControlList* cl);
void clInsertNop(ControlList* cl); void clInsertNop(ControlList* cl);
void clInsertFlush(ControlList* cl); void clInsertFlush(ControlList* cl);

47
driver/common.c
View File

@ -629,6 +629,7 @@ void vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t ins
clFit(commandBuffer, &commandBuffer->shaderRecCl, V3D21_SHADER_RECORD_length); clFit(commandBuffer, &commandBuffer->shaderRecCl, V3D21_SHADER_RECORD_length);
ControlList relocCl = commandBuffer->shaderRecCl; ControlList relocCl = commandBuffer->shaderRecCl;
//TODO number of attribs //TODO number of attribs
//3 is the number of type of possible shaders
int numAttribs = 1; int numAttribs = 1;
for(int c = 0; c < (3 + numAttribs)*4; ++c) for(int c = 0; c < (3 + numAttribs)*4; ++c)
{ {
@ -637,21 +638,21 @@ void vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t ins
clInsertShaderRecord(&commandBuffer->shaderRecCl, clInsertShaderRecord(&commandBuffer->shaderRecCl,
&relocCl, &relocCl,
&commandBuffer->handlesCl, &commandBuffer->handlesCl,
0, //single threaded? 1, //TODO single threaded?
0, //point size included in shaded vertex data? 0, //point size included in shaded vertex data?
0, //enable clipping? 1, //enable clipping?
0, //fragment number of unused uniforms? 0, //fragment number of unused uniforms?
0, //fragment number of varyings? 0, //fragment number of varyings?
0, //fragment uniform address? 0, //fragment uniform address?
fragCode, //fragment code address fragCode, //fragment code address
0, //vertex number of unused uniforms? 0, //vertex number of unused uniforms?
1, //TODO vertex attribute array select bits 1, //TODO vertex attribute array select bits
1, //TODO vertex total attribute size 8, //TODO vertex total attribute size
0, //vertex uniform address 0, //vertex uniform address
vertCode, //vertex shader code address vertCode, //vertex shader code address
0, //coordinate number of unused uniforms? 0, //coordinate number of unused uniforms?
1, //TODO coordinate attribute array select bits 1, //TODO coordinate attribute array select bits
1, //TODO coordinate total attribute size 8, //TODO coordinate total attribute size
0, //coordinate uniform address 0, //coordinate uniform address
coordCode //coordinate shader code address coordCode //coordinate shader code address
); );
@ -727,6 +728,44 @@ void vkCmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t ins
commandBuffer->submitCl.flags |= VC4_SUBMIT_CL_USE_CLEAR_COLOR; commandBuffer->submitCl.flags |= VC4_SUBMIT_CL_USE_CLEAR_COLOR;
commandBuffer->submitCl.clear_z = 0; //TODO commandBuffer->submitCl.clear_z = 0; //TODO
commandBuffer->submitCl.clear_s = 0; commandBuffer->submitCl.clear_s = 0;
//write uniforms
//TODO
/**
//FS
uniform count : 1
tex sample count : 0
uniform constant : 4291579008
//VS
uniform count : 4
tex sample count : 0
uniform constant : 1065353216
uniform viewport xscale : 15360.000000
uniform viewport yscale : -8640.000000
uniform viewport zoffset : 0.500000
//CS (same as VS)
uniform count : 4
tex sample count : 0
uniform viewport yscale : -8640.000000
uniform constant : 1065353216
uniform viewport xscale : 15360.000000
uniform viewport zoffset : 0.500000
/**/
clFit(commandBuffer, &commandBuffer->uniformsCl, 4*(1+4+4));
//FS
clInsertUniformConstant(&commandBuffer->uniformsCl, 4291579008);
//VS
clInsertUniformConstant(&commandBuffer->uniformsCl, 1065353216);
clInsertUniformXYScale(&commandBuffer->uniformsCl, (float)(i->width) * 0.5f * 16.0f);
clInsertUniformXYScale(&commandBuffer->uniformsCl, -1.0f * (float)(i->height) * 0.5f * 16.0f);
clInsertUniformZOffset(&commandBuffer->uniformsCl, 0.5f);
//CS
clInsertUniformXYScale(&commandBuffer->uniformsCl, -1.0f * (float)(i->height) * 0.5f * 16.0f);
clInsertUniformConstant(&commandBuffer->uniformsCl, 1065353216);
clInsertUniformXYScale(&commandBuffer->uniformsCl, (float)(i->width) * 0.5f * 16.0f);
clInsertUniformZOffset(&commandBuffer->uniformsCl, 0.5f);
} }
/* /*