From 29f6a7e5f7cde79fa25ccc4507b43f71aaebd54b Mon Sep 17 00:00:00 2001
From: Zebediah Figura <zfigura@codeweavers.com>
Date: Mon, 28 Aug 2023 17:21:34 -0500
Subject: [PATCH] vkd3d-shader/hlsl: Rename register_opt and packoffset_opt to
 register_reservation and packoffset_reservation.

"opt" seems to imply "optional", but the optional aspect of these reservations
is not (and never has been) encoded into these rules.
---
 libs/vkd3d-shader/hlsl.y | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index 0c196b77..ea108a52 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -5675,8 +5675,8 @@ static bool state_block_add_entry(struct hlsl_state_block *state_block, struct h
 %type <parameters> param_list
 %type <parameters> parameters
 
-%type <reg_reservation> register_opt
-%type <reg_reservation> packoffset_opt
+%type <reg_reservation> register_reservation
+%type <reg_reservation> packoffset_reservation
 
 %type <sampler_dim> texture_type texture_ms_type uav_type rov_type
 
@@ -6300,12 +6300,12 @@ colon_attribute:
             $$.reg_reservation.reg_type = 0;
             $$.reg_reservation.offset_type = 0;
         }
-    | register_opt
+    | register_reservation
         {
             $$.semantic = (struct hlsl_semantic){0};
             $$.reg_reservation = $1;
         }
-    | packoffset_opt
+    | packoffset_reservation
         {
             $$.semantic = (struct hlsl_semantic){0};
             $$.reg_reservation = $1;
@@ -6327,7 +6327,7 @@ semantic:
         }
 
 /* FIXME: Writemasks */
-register_opt:
+register_reservation:
       ':' KW_REGISTER '(' any_identifier ')'
         {
             $$ = parse_reg_reservation($4);
@@ -6342,7 +6342,7 @@ register_opt:
             vkd3d_free($6);
         }
 
-packoffset_opt:
+packoffset_reservation:
       ':' KW_PACKOFFSET '(' any_identifier ')'
         {
             $$ = parse_packoffset(ctx, $4, NULL, &@$);