vkr: remove manual device validation

The decoder makes sure the device pointer is non-NULL since 0f12c460
("vkr: make sure the first dispatchable handle is non-NULL").  And
vkr_cs_decoder_lookup_object is just fixed to validate the object type.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Ryan Neph <ryanneph@google.com>

src/venus/vkr_buffer.c

@@ -19,10 +19,6 @@ vkr_dispatch_vkCreateBuffer(struct vn_dispatch_context *dispatch,
    struct vkr_context *ctx = dispatch->data;
 
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
 #ifdef FORCE_ENABLE_DMABUF
    VkExternalMemoryBufferCreateInfo local_external_info;
@@ -95,30 +91,20 @@ vkr_dispatch_vkBindBufferMemory2(UNUSED struct vn_dispatch_context *dispatch,
 
 static void
 vkr_dispatch_vkGetBufferOpaqueCaptureAddress(
-   struct vn_dispatch_context *dispatch,
+   UNUSED struct vn_dispatch_context *dispatch,
    struct vn_command_vkGetBufferOpaqueCaptureAddress *args)
 {
-   struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    vn_replace_vkGetBufferOpaqueCaptureAddress_args_handle(args);
    args->ret = dev->GetBufferOpaqueCaptureAddress(args->device, args->pInfo);
 }
 
 static void
-vkr_dispatch_vkGetBufferDeviceAddress(struct vn_dispatch_context *dispatch,
+vkr_dispatch_vkGetBufferDeviceAddress(UNUSED struct vn_dispatch_context *dispatch,
                                       struct vn_command_vkGetBufferDeviceAddress *args)
 {
-   struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    vn_replace_vkGetBufferDeviceAddress_args_handle(args);
    args->ret = dev->GetBufferDeviceAddress(args->device, args->pInfo);

src/venus/vkr_common.h

@@ -53,10 +53,6 @@
  */
 #define CREATE_OBJECT(obj, vkr_type, vk_obj, vk_cmd, vk_arg)                             \
    struct vkr_device *_dev = (struct vkr_device *)args->device;                          \
-   if (!_dev || _dev->base.type != VK_OBJECT_TYPE_DEVICE) {                              \
-      vkr_cs_decoder_set_fatal(&ctx->decoder);                                           \
-      return;                                                                            \
-   }                                                                                     \
                                                                                          \
    struct vkr_##vkr_type *obj = calloc(1, sizeof(*obj));                                 \
    if (!obj) {                                                                           \
@@ -93,10 +89,6 @@
                               vkr_pool_type, vk_pool_type)                               \
    do {                                                                                  \
       struct vkr_device *dev = (struct vkr_device *)args->device;                        \
-      if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {                             \
-         vkr_cs_decoder_set_fatal(&ctx->decoder);                                        \
-         return;                                                                         \
-      }                                                                                  \
                                                                                          \
       struct vkr_##vkr_pool_type *pool =                                                 \
          (struct vkr_##vkr_pool_type *)(uintptr_t)args->pAllocateInfo->arg_pool;         \
@@ -163,10 +155,6 @@
 #define CREATE_PIPELINES(vk_cmd)                                                         \
    do {                                                                                  \
       struct vkr_device *dev = (struct vkr_device *)args->device;                        \
-      if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {                             \
-         vkr_cs_decoder_set_fatal(&ctx->decoder);                                        \
-         return;                                                                         \
-      }                                                                                  \
                                                                                          \
       struct object_array arr;                                                           \
       if (!object_array_init(&arr, args->createInfoCount, VK_OBJECT_TYPE_PIPELINE,       \

src/venus/vkr_device.c

@@ -368,11 +368,9 @@ vkr_dispatch_vkDestroyDevice(struct vn_dispatch_context *dispatch,
    struct vkr_context *ctx = dispatch->data;
 
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
+   /* this never happens */
-      if (dev)
+   if (!dev)
-         vkr_cs_decoder_set_fatal(&ctx->decoder);
       return;
-   }
 
    vkr_device_destroy(ctx, dev);
 }

src/venus/vkr_device_memory.c

@@ -46,10 +46,6 @@ vkr_dispatch_vkAllocateMemory(struct vn_dispatch_context *dispatch,
    struct vkr_context *ctx = dispatch->data;
 
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
 #ifdef FORCE_ENABLE_DMABUF
    VkExportMemoryAllocateInfo local_export_info;
@@ -190,15 +186,10 @@ vkr_dispatch_vkGetDeviceMemoryCommitment(
 
 static void
 vkr_dispatch_vkGetDeviceMemoryOpaqueCaptureAddress(
-   struct vn_dispatch_context *dispatch,
+   UNUSED struct vn_dispatch_context *dispatch,
    struct vn_command_vkGetDeviceMemoryOpaqueCaptureAddress *args)
 {
-   struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    vn_replace_vkGetDeviceMemoryOpaqueCaptureAddress_args_handle(args);
    args->ret = dev->GetDeviceMemoryOpaqueCaptureAddress(args->device, args->pInfo);
@@ -211,10 +202,6 @@ vkr_dispatch_vkGetMemoryResourcePropertiesMESA(
 {
    struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    struct vkr_resource_attachment *att =
       util_hash_table_get(ctx->resource_table, uintptr_to_pointer(args->resourceId));

src/venus/vkr_image.c

@@ -21,10 +21,6 @@ vkr_dispatch_vkCreateImage(struct vn_dispatch_context *dispatch,
    struct vkr_context *ctx = dispatch->data;
 
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
 #ifdef FORCE_ENABLE_DMABUF
    /* Do not chain VkExternalMemoryImageCreateInfo with optimal tiling, so that
@@ -133,15 +129,10 @@ vkr_dispatch_vkGetImageSubresourceLayout(
 
 static void
 vkr_dispatch_vkGetImageDrmFormatModifierPropertiesEXT(
-   struct vn_dispatch_context *dispatch,
+   UNUSED struct vn_dispatch_context *dispatch,
    struct vn_command_vkGetImageDrmFormatModifierPropertiesEXT *args)
 {
-   struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    vn_replace_vkGetImageDrmFormatModifierPropertiesEXT_args_handle(args);
    args->ret = dev->get_image_drm_format_modifier_properties(args->device, args->image,

src/venus/vkr_query_pool.c

@@ -43,15 +43,10 @@ vkr_dispatch_vkGetQueryPoolResults(UNUSED struct vn_dispatch_context *dispatch,
 }
 
 static void
-vkr_dispatch_vkResetQueryPool(struct vn_dispatch_context *dispatch,
+vkr_dispatch_vkResetQueryPool(UNUSED struct vn_dispatch_context *dispatch,
                               struct vn_command_vkResetQueryPool *args)
 {
-   struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    vn_replace_vkResetQueryPool_args_handle(args);
    dev->ResetQueryPool(args->device, args->queryPool, args->firstQuery, args->queryCount);

src/venus/vkr_queue.c

@@ -299,10 +299,6 @@ vkr_dispatch_vkGetDeviceQueue(struct vn_dispatch_context *dispatch,
    struct vkr_context *ctx = dispatch->data;
 
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    struct vkr_queue *queue = vkr_device_lookup_queue(
       dev, 0 /* flags */, args->queueFamilyIndex, args->queueIndex);
@@ -323,10 +319,6 @@ vkr_dispatch_vkGetDeviceQueue2(struct vn_dispatch_context *dispatch,
    struct vkr_context *ctx = dispatch->data;
 
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    struct vkr_queue *queue = vkr_device_lookup_queue(dev, args->pQueueInfo->flags,
                                                      args->pQueueInfo->queueFamilyIndex,
@@ -449,15 +441,10 @@ vkr_dispatch_vkDestroySemaphore(struct vn_dispatch_context *dispatch,
 }
 
 static void
-vkr_dispatch_vkGetSemaphoreCounterValue(struct vn_dispatch_context *dispatch,
+vkr_dispatch_vkGetSemaphoreCounterValue(UNUSED struct vn_dispatch_context *dispatch,
                                         struct vn_command_vkGetSemaphoreCounterValue *args)
 {
-   struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    vn_replace_vkGetSemaphoreCounterValue_args_handle(args);
    args->ret = dev->GetSemaphoreCounterValue(args->device, args->semaphore, args->pValue);
@@ -470,11 +457,6 @@ vkr_dispatch_vkWaitSemaphores(struct vn_dispatch_context *dispatch,
    struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
 
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
-
    /* no blocking call */
    if (args->timeout) {
       vkr_cs_decoder_set_fatal(&ctx->decoder);
@@ -486,15 +468,10 @@ vkr_dispatch_vkWaitSemaphores(struct vn_dispatch_context *dispatch,
 }
 
 static void
-vkr_dispatch_vkSignalSemaphore(struct vn_dispatch_context *dispatch,
+vkr_dispatch_vkSignalSemaphore(UNUSED struct vn_dispatch_context *dispatch,
                                struct vn_command_vkSignalSemaphore *args)
 {
-   struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    vn_replace_vkSignalSemaphore_args_handle(args);
    args->ret = dev->SignalSemaphore(args->device, args->pSignalInfo);

src/venus/vkr_render_pass.c

@@ -28,10 +28,6 @@ vkr_dispatch_vkCreateRenderPass2(struct vn_dispatch_context *dispatch,
 {
    struct vkr_context *ctx = dispatch->data;
    struct vkr_device *dev = (struct vkr_device *)args->device;
-   if (!dev || dev->base.type != VK_OBJECT_TYPE_DEVICE) {
-      vkr_cs_decoder_set_fatal(&ctx->decoder);
-      return;
-   }
 
    struct vkr_render_pass *pass = calloc(1, sizeof(*pass));
    if (!pass) {