diff --git a/CMakeLists.txt b/CMakeLists.txt index b13f46b..9e46d23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,13 @@ link_directories(${EXTERNAL_PATH}/lib) include_directories(${EXTERNAL_PATH}/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +set(RPI_ARCH + armv8-a #RPi support: 2B 1.2, 3B, 3B+ + #armv7-a #RPi support: 2B + #armv8 #RPi support: 3A+ + #armv6z #RPi support: 1A, 1A+, 1B, Zero 1.2, Zero 1.3, Zero W + ) + add_subdirectory(brcm) add_subdirectory(QPUassembler) add_subdirectory(driver) diff --git a/QPUassembler/CMakeLists.txt b/QPUassembler/CMakeLists.txt index 2a27456..c8e520a 100644 --- a/QPUassembler/CMakeLists.txt +++ b/QPUassembler/CMakeLists.txt @@ -8,7 +8,7 @@ file(GLOB asmSrc ) add_library(QPUassembler OBJECT ${asmSrc}) -target_compile_options(QPUassembler PRIVATE -Wall -Werror=implicit-function-declaration -std=c11) +target_compile_options(QPUassembler PRIVATE -Wall -Werror=implicit-function-declaration -std=c11 -march=${RPI_ARCH} -fPIC) add_executable(QPUassemblerExe ${asmSrc} main.c shaders.h) -target_compile_options(QPUassemblerExe PRIVATE -Wall -Werror=implicit-function-declaration -std=c11) +target_compile_options(QPUassemblerExe PRIVATE -Wall -Werror=implicit-function-declaration -std=c11 -march=${RPI_ARCH} -fPIC) diff --git a/brcm/CMakeLists.txt b/brcm/CMakeLists.txt index 3aeeebd..4c41f1c 100644 --- a/brcm/CMakeLists.txt +++ b/brcm/CMakeLists.txt @@ -23,6 +23,9 @@ else(CMD_ERROR2 STREQUAL "") endif(CMD_ERROR2 STREQUAL "") add_library(brcm OBJECT ${brcmSrc}) -target_compile_options(brcm PRIVATE -Wall -std=c99) +target_compile_options(brcm PRIVATE -Wall -std=c99 + -march=${RPI_ARCH} + -fPIC + ) #target_link_libraries(brcm expat z) target_compile_definitions(brcm PRIVATE V3D_VERSION=21) diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt index 082740c..ccae5a5 100644 --- a/driver/CMakeLists.txt +++ b/driver/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB driverSrc ) add_library(rpi-vk-driver SHARED ${driverSrc}) -target_compile_options(rpi-vk-driver PRIVATE -Wall -Wextra -Wpacked -Wcast-align -std=c11) +target_compile_options(rpi-vk-driver PRIVATE -Wall -Wextra -Wpacked -Wcast-align -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(rpi-vk-driver drm pthread expat z $ $) diff --git a/driver/ConsecutivePoolAllocator.c b/driver/ConsecutivePoolAllocator.c index f7bd569..113e271 100644 --- a/driver/ConsecutivePoolAllocator.c +++ b/driver/ConsecutivePoolAllocator.c @@ -182,8 +182,6 @@ uint32_t consecutivePoolReAllocate(ConsecutivePoolAllocator* pa, void* currentMe assert(currentMem); assert(currNumBlocks); - fprintf(stderr, "CPA realloc begin \n"); - uint32_t* nextCandidate = (char*)currentMem + pa->blockSize * currNumBlocks; uint32_t* prevPtr = 0; @@ -202,8 +200,6 @@ uint32_t consecutivePoolReAllocate(ConsecutivePoolAllocator* pa, void* currentMe pa->nextFreeBlock = *listPtr; } - fprintf(stderr, "CPA realloc end continue \n"); - return (char*)currentMem - pa->buf; } @@ -218,17 +214,11 @@ uint32_t consecutivePoolReAllocate(ConsecutivePoolAllocator* pa, void* currentMe { return -1; } - - fprintf(stderr, "CPA realloc pre-copy \n"); - fprintf(stderr, "new offset %u, buf %p, max size %u, to copy %u\n", newMemOffset, pa->buf, pa->size, currNumBlocks * pa->blockSize); - //copy over old content memcpy(pa->buf + newMemOffset, currentMem, currNumBlocks * pa->blockSize); //free current element consecutivePoolFree(pa, currentMem, currNumBlocks); - fprintf(stderr, "CPA realloc end copy \n"); - return newMemOffset; } } diff --git a/driver/command.c b/driver/command.c index 657d6bb..87b4067 100644 --- a/driver/command.c +++ b/driver/command.c @@ -337,22 +337,6 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkQueueSubmit( uint32_t writeMSAAimageIdx = writeMSAAimage ? clGetHandleIndex(&cmdbuf->handlesCl, marker->handlesSize, marker->handlesBufOffset + cmdbuf->handlesCl.offset, writeMSAAimage->boundMem->bo) : 0; uint32_t writeMSAAdepthStencilImageIdx = writeMSAAdepthStencilImage ? clGetHandleIndex(&cmdbuf->handlesCl, marker->handlesBufOffset + cmdbuf->handlesCl.offset, marker->handlesSize, writeMSAAdepthStencilImage->boundMem->bo) : 0; -// fprintf(stderr, "writeImage: %u\n", writeImage); -// fprintf(stderr, "readImage: %u\n", readImage); -// fprintf(stderr, "writeDepthStencilImage: %u\n", writeDepthStencilImage); -// fprintf(stderr, "readDepthStencilImage: %u\n", readDepthStencilImage); -// fprintf(stderr, "writeMSAAimage: %u\n", writeMSAAimage); -// fprintf(stderr, "writeMSAAdepthStencilImage: %u\n", writeMSAAdepthStencilImage); -// fprintf(stderr, "performResolve: %u\n", performResolve); -// fprintf(stderr, "readMSAAimage: %u\n", readMSAAimage); -// fprintf(stderr, "readMSAAdepthStencilImage: %u\n", readMSAAdepthStencilImage); -// fprintf(stderr, "writeImageIdx: %u\n", writeImageIdx); -// fprintf(stderr, "readImageIdx: %u\n", readImageIdx); -// fprintf(stderr, "writeDepthStencilImageIdx: %u\n", writeDepthStencilImageIdx); -// fprintf(stderr, "readDepthStencilImageIdx: %u\n", readDepthStencilImageIdx); -// fprintf(stderr, "writeMSAAimageIdx: %u\n", writeMSAAimageIdx); -// fprintf(stderr, "writeMSAAdepthStencilImageIdx: %u\n", writeMSAAdepthStencilImageIdx); - submitCl.clear_color[0] = 0; submitCl.clear_color[1] = 0; submitCl.clear_z = 0; diff --git a/driver/common.c b/driver/common.c index 67243c0..ce1bd3f 100644 --- a/driver/common.c +++ b/driver/common.c @@ -535,12 +535,10 @@ void clFit(VkCommandBuffer cb, ControlList* cl, uint32_t commandSize) { uint32_t currSize = cl->nextFreeByteOffset - cl->offset; uint32_t currMarkerOffset = cl->currMarkerOffset - cl->offset; - fprintf(stderr, "currOffset %u nextFreeByteOffset %u currMarkerOffset %u\n", cl->offset, cl->nextFreeByteOffset, cl->currMarkerOffset); cl->offset = consecutivePoolReAllocate(cl->CPA, getCPAptrFromOffset(cl->CPA, cl->offset), cl->numBlocks); assert(cl->offset != -1); cl->nextFreeByteOffset = cl->offset + currSize; cl->numBlocks++; cl->currMarkerOffset = cl->currMarkerOffset == -1 ? -1 : cl->offset + currMarkerOffset; - fprintf(stderr, "currOffset %u nextFreeByteOffset %u currMarkerOffset %u\n", cl->offset, cl->nextFreeByteOffset, cl->currMarkerOffset); if(cl->currMarkerOffset != -1) { assert(((CLMarker*)getCPAptrFromOffset(cl->CPA, cl->currMarkerOffset))->memGuard == 0xDDDDDDDD); diff --git a/driver/descriptorSet.c b/driver/descriptorSet.c index a070615..4390f00 100644 --- a/driver/descriptorSet.c +++ b/driver/descriptorSet.c @@ -53,10 +53,6 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkCreateDescriptorPool( dp->descriptorSetPA = createPoolAllocator(dsmem, sizeof(_descriptorSet), sizeof(_descriptorSet) * pCreateInfo->maxSets); -// fprintf(stderr, "imageDescriptorCount %u\n", imageDescriptorCount); -// fprintf(stderr, "bufferDescriptorCount %u\n", bufferDescriptorCount); -// fprintf(stderr, "texelBufferDescriptorCount %u\n", texelBufferDescriptorCount); - uint32_t mapElemBlockSize = sizeof(mapElem); uint32_t mapBufSize = mapElemBlockSize * (imageDescriptorCount + bufferDescriptorCount + texelBufferDescriptorCount); @@ -156,10 +152,6 @@ VKAPI_ATTR VkResult VKAPI_CALL rpi_vkAllocateDescriptorSets( ds->bufferDescriptors = 0; ds->texelBufferDescriptors = 0; -// fprintf(stderr, "imageDescriptorCount %u\n", imageDescriptorCount); -// fprintf(stderr, "bufferDescriptorCount %u\n", bufferDescriptorCount); -// fprintf(stderr, "texelBufferDescriptorCount %u\n", texelBufferDescriptorCount); - if(imageDescriptorCount > 0) { ds->imageDescriptors = getCPAptrFromOffset(&dp->imageDescriptorCPA, consecutivePoolAllocate(&dp->imageDescriptorCPA, imageDescriptorCount)); diff --git a/driver/draw.c b/driver/draw.c index 6ab1978..629296e 100644 --- a/driver/draw.c +++ b/driver/draw.c @@ -143,10 +143,6 @@ static uint32_t drawCommon(VkCommandBuffer commandBuffer, int32_t vertexOffset) vertModule = cb->graphicsPipeline->modules[ulog2(VK_SHADER_STAGE_VERTEX_BIT)]; } -// fprintf(stderr, "==============\n", fragModule); -// fprintf(stderr, "fragModule %p\n", fragModule); -// fprintf(stderr, "vertModule %p\n", vertModule); - if(!vertModule) { vertModule = fragModule; @@ -157,9 +153,6 @@ static uint32_t drawCommon(VkCommandBuffer commandBuffer, int32_t vertexOffset) fragModule = vertModule; } -// fprintf(stderr, "fragModule %p\n", fragModule); -// fprintf(stderr, "vertModule %p\n", vertModule); - assert(fragModule); assert(vertModule); assert(fragModule->bos[VK_RPI_ASSEMBLY_TYPE_FRAGMENT]); @@ -299,15 +292,6 @@ static uint32_t drawCommon(VkCommandBuffer commandBuffer, int32_t vertexOffset) - cb->vertexBuffers[cb->graphicsPipeline->vertexAttributeDescriptions[c].binding]->boundOffset - formatByteSize) / stride; -// fprintf(stderr, "usedIndices %i\n", usedIndices); -// fprintf(stderr, "boundMemsize %i\n", cb->vertexBuffers[cb->graphicsPipeline->vertexAttributeDescriptions[c].binding]->boundMem->size); -// fprintf(stderr, "vertexattrib offset %i\n", cb->graphicsPipeline->vertexAttributeDescriptions[c].offset); -// fprintf(stderr, "vertex offset %i\n", vertexOffset * stride); -// fprintf(stderr, "vertex buffer offset %i\n", cb->vertexBufferOffsets[cb->graphicsPipeline->vertexAttributeDescriptions[c].binding]); -// fprintf(stderr, "bound offset %i\n", cb->vertexBuffers[cb->graphicsPipeline->vertexAttributeDescriptions[c].binding]->boundOffset); -// fprintf(stderr, "format size %i\n", formatByteSize); -// fprintf(stderr, "stride %i\n", stride); - if(usedIndices < maxIndex) { maxIndex = usedIndices; diff --git a/driver/shader.c b/driver/shader.c index 1904ee8..bd6c557 100644 --- a/driver/shader.c +++ b/driver/shader.c @@ -403,10 +403,6 @@ VkResult rpi_vkCreateShaderModule(VkDevice device, const VkShaderModuleCreateInf assert(hadVertex == hadCoordinate); -// fprintf(stderr, "pixel shader bo %i\n", shader->bos[2]); -// fprintf(stderr, "vertex shader bo %i\n", shader->bos[1]); -// fprintf(stderr, "coord shader bo %i\n", shader->bos[0]); - *pShaderModule = shader; return VK_SUCCESS; diff --git a/driver/stateChange.c b/driver/stateChange.c index 0d290bc..9bf0fe1 100644 --- a/driver/stateChange.c +++ b/driver/stateChange.c @@ -275,12 +275,6 @@ void createClearShaderModule(VkDevice device, VkShaderModule* blitShaderModule, rpi_vkCreateShaderModule(device, &smci, 0, blitShaderModuleNoColor); assert(*blitShaderModuleNoColor); -// _shaderModule* s = *blitShaderModule; -// fprintf(stderr, "=================\n"); -// fprintf(stderr, "pixel shader bo %i\n", s->bos[2]); -// fprintf(stderr, "vertex shader bo %i\n", s->bos[1]); -// fprintf(stderr, "coord shader bo %i\n", s->bos[0]); - for(uint32_t c = 0; c < 4; ++c) { free(asm_ptrs[c]); @@ -652,12 +646,6 @@ VKAPI_ATTR void VKAPI_CALL rpi_vkCmdClearAttachments( createClearPipeline(device, &dsci, clearColor ? device->emulClearShaderModule : device->emulClearNoColorShaderModule, device->emulClearDsl, &blitPipelineLayout, cmdBuf->currRenderPass, &blitPipeline); -// _shaderModule* s = device->emulClearShaderModule; -// fprintf(stderr, "=================\n"); -// fprintf(stderr, "pixel shader bo %i\n", s->bos[2]); -// fprintf(stderr, "vertex shader bo %i\n", s->bos[1]); -// fprintf(stderr, "coord shader bo %i\n", s->bos[0]); - rpi_vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, blitPipeline); VkDeviceSize offsets = 0; diff --git a/test/CPAtest/CMakeLists.txt b/test/CPAtest/CMakeLists.txt index cb40470..1e1e116 100644 --- a/test/CPAtest/CMakeLists.txt +++ b/test/CPAtest/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(CPAtest ${testSrc}) -target_compile_options(CPAtest PRIVATE -Wall -std=c++11) +target_compile_options(CPAtest PRIVATE -Wall -std=c++11 + -march=${RPI_ARCH} + ) target_link_libraries(CPAtest rpi-vk-driver) diff --git a/test/ETC/CMakeLists.txt b/test/ETC/CMakeLists.txt index b3ff028..2ab1566 100644 --- a/test/ETC/CMakeLists.txt +++ b/test/ETC/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(ETC ${testSrc} ) -target_compile_options(ETC PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(ETC PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(ETC vulkan $) diff --git a/test/HDR/CMakeLists.txt b/test/HDR/CMakeLists.txt index 173ef19..136ac99 100644 --- a/test/HDR/CMakeLists.txt +++ b/test/HDR/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(HDR ${testSrc} ) -target_compile_options(HDR PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(HDR PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(HDR vulkan $) diff --git a/test/MSAA/CMakeLists.txt b/test/MSAA/CMakeLists.txt index de17666..1801f55 100644 --- a/test/MSAA/CMakeLists.txt +++ b/test/MSAA/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(MSAA ${testSrc} ) -target_compile_options(MSAA PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(MSAA PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(MSAA vulkan $) diff --git a/test/attribTest/CMakeLists.txt b/test/attribTest/CMakeLists.txt index f46b53a..5edae4e 100644 --- a/test/attribTest/CMakeLists.txt +++ b/test/attribTest/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(attribTest ${testSrc} ) -target_compile_options(attribTest PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(attribTest PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(attribTest vulkan $) diff --git a/test/blending/CMakeLists.txt b/test/blending/CMakeLists.txt index a2b767f..0411c50 100644 --- a/test/blending/CMakeLists.txt +++ b/test/blending/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(blending ${testSrc} ) -target_compile_options(blending PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(blending PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(blending vulkan $) diff --git a/test/clear/CMakeLists.txt b/test/clear/CMakeLists.txt index 6465982..73bd28e 100644 --- a/test/clear/CMakeLists.txt +++ b/test/clear/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(clear ${testSrc}) -target_compile_options(clear PRIVATE -Wall -std=c++11) +target_compile_options(clear PRIVATE -Wall -std=c++11 + -march=${RPI_ARCH} + ) target_link_libraries(clear vulkan $) diff --git a/test/clearTest/CMakeLists.txt b/test/clearTest/CMakeLists.txt index 9f9774d..6ad59e7 100644 --- a/test/clearTest/CMakeLists.txt +++ b/test/clearTest/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(clearTest ${testSrc} ) -target_compile_options(clearTest PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(clearTest PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(clearTest vulkan $) diff --git a/test/cubemapping/CMakeLists.txt b/test/cubemapping/CMakeLists.txt index ffbadaa..4dfdea7 100644 --- a/test/cubemapping/CMakeLists.txt +++ b/test/cubemapping/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(cubemapping ${testSrc} ) -target_compile_options(cubemapping PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(cubemapping PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(cubemapping vulkan $) diff --git a/test/depthTest/CMakeLists.txt b/test/depthTest/CMakeLists.txt index 12d5313..571c483 100644 --- a/test/depthTest/CMakeLists.txt +++ b/test/depthTest/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(depthTest ${testSrc} ) -target_compile_options(depthTest PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(depthTest PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(depthTest vulkan $) diff --git a/test/depthTex/CMakeLists.txt b/test/depthTex/CMakeLists.txt index 1d90ac8..4b3e780 100644 --- a/test/depthTex/CMakeLists.txt +++ b/test/depthTex/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(depthTex ${testSrc} ) -target_compile_options(depthTex PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(depthTex PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(depthTex vulkan $) diff --git a/test/indexedTriangle/CMakeLists.txt b/test/indexedTriangle/CMakeLists.txt index 4c724e7..ecf986f 100644 --- a/test/indexedTriangle/CMakeLists.txt +++ b/test/indexedTriangle/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(indexedTriangle ${testSrc} ) -target_compile_options(indexedTriangle PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(indexedTriangle PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(indexedTriangle vulkan $) diff --git a/test/inputTest/CMakeLists.txt b/test/inputTest/CMakeLists.txt index 3a9c019..c3c926f 100644 --- a/test/inputTest/CMakeLists.txt +++ b/test/inputTest/CMakeLists.txt @@ -4,7 +4,9 @@ file(GLOB testSrc ) add_executable(inputTest ${testSrc}) -target_compile_options(inputTest PRIVATE -Wall -std=c++11) +target_compile_options(inputTest PRIVATE -Wall -std=c++11 + -march=${RPI_ARCH} + ) target_link_libraries(inputTest mtdev evdev udev input) diff --git a/test/mipmapping/CMakeLists.txt b/test/mipmapping/CMakeLists.txt index e81f36e..f72f49d 100644 --- a/test/mipmapping/CMakeLists.txt +++ b/test/mipmapping/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(mipmapping ${testSrc} ) -target_compile_options(mipmapping PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(mipmapping PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(mipmapping vulkan $) diff --git a/test/query/CMakeLists.txt b/test/query/CMakeLists.txt index 29d5a7d..6757843 100644 --- a/test/query/CMakeLists.txt +++ b/test/query/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(query ${testSrc} ) -target_compile_options(query PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(query PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(query vulkan $) diff --git a/test/stencilTest/CMakeLists.txt b/test/stencilTest/CMakeLists.txt index a1614e5..b38fd4d 100644 --- a/test/stencilTest/CMakeLists.txt +++ b/test/stencilTest/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(stencilTest ${testSrc} ) -target_compile_options(stencilTest PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(stencilTest PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(stencilTest vulkan $) diff --git a/test/texturing/CMakeLists.txt b/test/texturing/CMakeLists.txt index 4147e9c..a5c6804 100644 --- a/test/texturing/CMakeLists.txt +++ b/test/texturing/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(texturing ${testSrc} ) -target_compile_options(texturing PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(texturing PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(texturing vulkan $) diff --git a/test/triangle/CMakeLists.txt b/test/triangle/CMakeLists.txt index d3c1769..fcd83bb 100644 --- a/test/triangle/CMakeLists.txt +++ b/test/triangle/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(triangle ${testSrc} ) -target_compile_options(triangle PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(triangle PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(triangle vulkan $) diff --git a/test/varyings/CMakeLists.txt b/test/varyings/CMakeLists.txt index f332bc5..bceed94 100644 --- a/test/varyings/CMakeLists.txt +++ b/test/varyings/CMakeLists.txt @@ -4,6 +4,8 @@ file(GLOB testSrc ) add_executable(varyings ${testSrc} ) -target_compile_options(varyings PRIVATE -Wall -std=c++11 -std=c11) +target_compile_options(varyings PRIVATE -Wall -std=c++11 -std=c11 + -march=${RPI_ARCH} + ) target_link_libraries(varyings vulkan $)