Vulkan: Do not allow incomplete texture data

Transfering incomplete texture data may crash the grpc. E.g.: ResourceData: Texture2D<Levels: nil> crashes grpc.
google · Oct 27, 2018 · 58fd0cc · 58fd0cc
1 parent bb688bb
commit 58fd0cc
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/gapis/api/vulkan/resources.go b/gapis/api/vulkan/resources.go
@@ -657,10 +657,10 @@ func (t ImageObjectʳ) ResourceData(ctx context.Context, s *api.GlobalState) (*a
 				for level := uint32(0); level < t.Info().MipLevels(); level++ {
 					info := t.imageInfo(ctx, s, vkFmt, layer, level)
 					if info == nil {
-						continue
+						return nil, &service.ErrDataUnavailable{Reason: messages.ErrNoTextureData(t.ResourceHandle())}
 					}
 					if !setCubemapFace(info, cubeMapLevels[level], layer) {
-						continue
+						return nil, &service.ErrDataUnavailable{Reason: messages.ErrNoTextureData(t.ResourceHandle())}
 					}
 				}
 			}
@@ -676,7 +676,7 @@ func (t ImageObjectʳ) ResourceData(ctx context.Context, s *api.GlobalState) (*a
 				for level := uint32(0); level < t.Info().MipLevels(); level++ {
 					info := t.imageInfo(ctx, s, vkFmt, layer, level)
 					if info == nil {
-						continue
+						return nil, &service.ErrDataUnavailable{Reason: messages.ErrNoTextureData(t.ResourceHandle())}
 					}
 					levels[level] = info
 				}
@@ -690,7 +690,7 @@ func (t ImageObjectʳ) ResourceData(ctx context.Context, s *api.GlobalState) (*a
 		for level := uint32(0); level < t.Info().MipLevels(); level++ {
 			info := t.imageInfo(ctx, s, vkFmt, 0, level)
 			if info == nil {
-				continue
+				return nil, &service.ErrDataUnavailable{Reason: messages.ErrNoTextureData(t.ResourceHandle())}
 			}
 			levels[level] = info
 		}
@@ -702,7 +702,7 @@ func (t ImageObjectʳ) ResourceData(ctx context.Context, s *api.GlobalState) (*a
 		for level := uint32(0); level < t.Info().MipLevels(); level++ {
 			info := t.imageInfo(ctx, s, vkFmt, 0, level)
 			if info == nil {
-				continue
+				return nil, &service.ErrDataUnavailable{Reason: messages.ErrNoTextureData(t.ResourceHandle())}
 			}
 			levels[level] = info
 		}
@@ -717,7 +717,7 @@ func (t ImageObjectʳ) ResourceData(ctx context.Context, s *api.GlobalState) (*a
 				for level := uint32(0); level < t.Info().MipLevels(); level++ {
 					info := t.imageInfo(ctx, s, vkFmt, layer, level)
 					if info == nil {
-						continue
+						return nil, &service.ErrDataUnavailable{Reason: messages.ErrNoTextureData(t.ResourceHandle())}
 					}
 					levels[level] = info
 				}
@@ -730,7 +730,7 @@ func (t ImageObjectʳ) ResourceData(ctx context.Context, s *api.GlobalState) (*a
 		for level := uint32(0); level < t.Info().MipLevels(); level++ {
 			info := t.imageInfo(ctx, s, vkFmt, 0, level)
 			if info == nil {
-				continue
+				return nil, &service.ErrDataUnavailable{Reason: messages.ErrNoTextureData(t.ResourceHandle())}
 			}
 			levels[level] = info
 		}
@@ -1238,11 +1238,11 @@ func pipelineResourceData(ctx context.Context,
 	return &api.ResourceData{
 		Data: &api.ResourceData_Pipeline{
 			Pipeline: &api.Pipeline{
-				API:      path.NewAPI(id.ID(ID)),
-				Type:     pipeType,
-				Stages:   stages,
-				Bindings: bindingSlice,
-				Bound:    bound,
+				API:                       path.NewAPI(id.ID(ID)),
+				Type:                      pipeType,
+				Stages:                    stages,
+				Bindings:                  bindingSlice,
+				Bound:                     bound,
 				BindingTypeConstantsIndex: int32(VkDescriptorTypeConstants()),
 				ImageLayoutConstantsIndex: int32(VkImageLayoutConstants()),
 			},