X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fvk.c;fp=src%2Fvk.c;h=3ea0060d0accf7f75810beb9fa9ab79175a5e682;hb=7709af4a73b0ee7b6a40dfe8e6adb8624b1e9821;hp=29628f9be11dcbc125a7dcb96e54b94d6176ab8b;hpb=2fce392c750852815282044c03c4b00036660453;p=vktest3

diff --git a/src/vk.c b/src/vk.c
index 29628f9..3ea0060 100644
--- a/src/vk.c
+++ b/src/vk.c
@@ -511,6 +511,7 @@ VkRenderPass vk_rpass(int rp)
 			att[i].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 			att[i].finalLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
 		}
+		/*
 		att[zidx].format = r->zfmt;
 		att[zidx].samples = 1;
 		att[zidx].loadOp = r->clear ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
@@ -519,23 +520,26 @@ VkRenderPass vk_rpass(int rp)
 		att[zidx].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 		att[zidx].initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 		att[zidx].finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+		*/
 
 		for(i=0; i<r->num_colbuf; i++) {
 			catref[i].attachment = i;
 			catref[i].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
 		}
+		/*
 		zatref.attachment = zidx;
 		zatref.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+		*/
 
 		memset(&subpass, 0, sizeof subpass);
 		subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS;
 		subpass.colorAttachmentCount = r->num_colbuf;
 		subpass.pColorAttachments = catref;
-		subpass.pDepthStencilAttachment = &zatref;
+		subpass.pDepthStencilAttachment = 0;//&zatref;
 
 		memset(&pinf, 0, sizeof pinf);
 		pinf.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO;
-		pinf.attachmentCount = r->num_colbuf + 1;
+		pinf.attachmentCount = r->num_colbuf;// + 1;
 		pinf.pAttachments = att;
 		pinf.subpassCount = 1;
 		pinf.pSubpasses = &subpass;
@@ -660,6 +664,7 @@ VkFramebuffer vk_fb(int fb)
 		fbinf.pAttachments = f->imgv;
 		fbinf.width = f->width;
 		fbinf.height = f->height;
+		fbinf.layers = 1;
 
 		if(vkCreateFramebuffer(vkdev, &fbinf, 0, &f->vkobj) != 0) {
 			fprintf(stderr, "vk_fb: failed to create framebuffer\n");
@@ -1079,6 +1084,7 @@ void vk_rect(VkRect2D *r, int x, int y, int w, int h)
 
 #define ARRSZ(arr)	(sizeof arr / sizeof *arr)
 static const char *known_layer_list[] = {
+	"VK_LAYER_KHRONOS_validation",
 	"VK_LAYER_GOOGLE_threading",
 	"VK_LAYER_LUNARG_parameter_validation",
 	"VK_LAYER_LUNARG_object_tracker",