diff --git a/CMCore b/CMCore index 006eaa3f..b5c66fe2 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 006eaa3f1c0b46e70c01a672d919e8740cb8f2bb +Subproject commit b5c66fe2cd440d15db54219404a2b4b44ce1018f diff --git a/CMSceneGraph b/CMSceneGraph index dd6ffdeb..95ebf98d 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit dd6ffdebeceea0dfc03ee58314bedfae2fc17899 +Subproject commit 95ebf98ddb0c1f48859e84830e2bcd44965f04f5 diff --git a/inc/hgl/graph/VKCommandBuffer.h b/inc/hgl/graph/VKCommandBuffer.h index 0216ed09..b33c461d 100644 --- a/inc/hgl/graph/VKCommandBuffer.h +++ b/inc/hgl/graph/VKCommandBuffer.h @@ -43,9 +43,7 @@ class RenderCmdBuffer:public GPUCmdBuffer VkClearValue *clear_values; VkRect2D render_area; VkViewport viewport; - - float default_line_width; - + Framebuffer *fbo; RenderPassBeginInfo rp_begin; VkPipelineLayout pipeline_layout; @@ -179,8 +177,6 @@ public: void SetViewport (uint32_t first,uint32_t count,const VkViewport *vp) {vkCmdSetViewport(cmd_buf,first,count,vp);} void SetScissor (uint32_t first,uint32_t count,const VkRect2D *sci) {vkCmdSetScissor(cmd_buf,first,count,sci);} - void SetLineWidth (float line_width) {vkCmdSetLineWidth(cmd_buf,line_width);} - void SetDepthBias (float constant_factor,float clamp,float slope_factor) {vkCmdSetDepthBias(cmd_buf,constant_factor,clamp,slope_factor);} void SetDepthBounds (float min_db,float max_db) {vkCmdSetDepthBounds(cmd_buf,min_db,max_db);} void SetBlendConstants (const float constants[4]) {vkCmdSetBlendConstants(cmd_buf,constants);} diff --git a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp index 5cc9eed6..88370e13 100644 --- a/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp +++ b/src/SceneGraph/Vulkan/VKCommandBufferRender.cpp @@ -14,8 +14,6 @@ RenderCmdBuffer::RenderCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer hgl_zero(render_area); hgl_zero(viewport); - default_line_width=1.0; - fbo=nullptr; pipeline_layout=VK_NULL_HANDLE; } @@ -94,7 +92,6 @@ bool RenderCmdBuffer::BeginRenderPass() vkCmdSetViewport(cmd_buf,0,1,&viewport); vkCmdSetScissor(cmd_buf,0,1,&render_area); - vkCmdSetLineWidth(cmd_buf,default_line_width); pipeline_layout=VK_NULL_HANDLE;