Merge pull request #3767 from ReinUsesLisp/point-size-pipeline

vk_pipeline_cache: Fix unintentional memcpy into optional
This commit is contained in:
Mat M 2020-04-22 21:20:14 -04:00 committed by GitHub
commit 2c806c5fd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -330,8 +330,10 @@ VKPipelineCache::DecompileShaders(const GraphicsPipelineCacheKey& key) {
Specialization specialization;
if (fixed_state.rasterizer.Topology() == Maxwell::PrimitiveTopology::Points) {
ASSERT(fixed_state.rasterizer.point_size != 0);
std::memcpy(&specialization.point_size, &fixed_state.rasterizer.point_size, sizeof(u32));
float point_size;
std::memcpy(&point_size, &fixed_state.rasterizer.point_size, sizeof(float));
specialization.point_size = point_size;
ASSERT(point_size != 0.0f);
}
for (std::size_t i = 0; i < Maxwell::NumVertexAttributes; ++i) {
specialization.attribute_types[i] = fixed_state.vertex_input.attributes[i].Type();