aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2015-02-23 10:41:08 -0700
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-03-02 17:21:10 -0700
commit06f82818902ab66bb63c0fb4569cea76b10f2c03 (patch)
tree9fa41e1eae8f5e8e66ba9dcefd9b8a4b494c4cf2
parent8254bebed7609fe24902267bea25e3866f2a4bcc (diff)
downloadusermoji-06f82818902ab66bb63c0fb4569cea76b10f2c03.tar.xz
demos/cube: use a single layout
Conflicts: demos/cube.c
-rw-r--r--demos/cube.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/demos/cube.c b/demos/cube.c
index bc4dd466..73a0c6a5 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1155,11 +1155,12 @@ static void demo_prepare_descriptor_layout(struct demo *demo)
.stageFlags = XGL_SHADER_STAGE_FLAGS_VERTEX_BIT,
.immutableSampler = XGL_NULL_HANDLE,
};
- const uint32_t bind_points[2] = { 0, 0 };
+
+ const uint32_t bind_point = 0;
XGL_RESULT err;
err = xglCreateDescriptorSetLayout(demo->device,
- XGL_SHADER_STAGE_FLAGS_VERTEX_BIT | XGL_SHADER_STAGE_FLAGS_FRAGMENT_BIT, bind_points,
+ XGL_SHADER_STAGE_FLAGS_ALL, &bind_point,
XGL_NULL_HANDLE, &descriptor_layout_vs,
&demo->desc_layout);
assert(!err);