diff --git a/.pick_status.json b/.pick_status.json index 264ad5c91e3..46ae42c2cb5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1129,7 +1129,7 @@ "description": "virgl: don't move input gl_SampleMaskIn to a temp", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "bc912bace1cf8cd03793c5ae34bd5a2afd015019" }, diff --git a/src/gallium/drivers/virgl/virgl_tgsi.c b/src/gallium/drivers/virgl/virgl_tgsi.c index 747ac0e043b..b781df78f10 100644 --- a/src/gallium/drivers/virgl/virgl_tgsi.c +++ b/src/gallium/drivers/virgl/virgl_tgsi.c @@ -49,7 +49,6 @@ enum virgl_input_temps { INPUT_TEMP_VIEWPORT_INDEX, INPUT_TEMP_BLOCK_ID, INPUT_TEMP_HELPER_INVOCATION, - INPUT_TEMP_SAMPLEMASK, INPUT_TEMP_COUNT, }; @@ -109,8 +108,6 @@ virgl_tgsi_transform_declaration(struct tgsi_transform_context *ctx, TGSI_SEMANTIC_BLOCK_ID); virgl_tgsi_transform_declaration_input_temp(decl, &vtctx->input_temp[INPUT_TEMP_HELPER_INVOCATION], TGSI_SEMANTIC_HELPER_INVOCATION); - virgl_tgsi_transform_declaration_input_temp(decl, &vtctx->input_temp[INPUT_TEMP_SAMPLEMASK], - TGSI_SEMANTIC_SAMPLEMASK); break; case TGSI_FILE_OUTPUT: switch (decl->Semantic.Name) { @@ -219,7 +216,6 @@ virgl_tgsi_transform_prolog(struct tgsi_transform_context * ctx) */ virgl_mov_input_temp_sint(ctx, &vtctx->input_temp[INPUT_TEMP_LAYER]); virgl_mov_input_temp_sint(ctx, &vtctx->input_temp[INPUT_TEMP_VIEWPORT_INDEX]); - virgl_mov_input_temp_sint(ctx, &vtctx->input_temp[INPUT_TEMP_SAMPLEMASK]); /* virglrenderer also makes mistakes in the types of block id input * references from signed ops, so we use a temp that we do a plain MOV to at