Translator: remove image2DRect

scripts/code_generation_hashes/Static_builtins.json

 {
   "src/compiler/translator/ImmutableString_ESSL_autogen.cpp":
-    "a60ac3aafb91de4358c1d811494c95c9",
+    "adbe9a6e20d1767868bd244e2ab26700",
   "src/compiler/translator/ImmutableString_autogen.cpp":
-    "16e37e1ca019440226125af698783034",
+    "17fee9e32a470052515cd76d4e57300b",
   "src/compiler/translator/ParseContext_ESSL_autogen.h":
-    "9efd14cccb9bc5a099ac5c24b87b01b0",
+    "c7dfcf533dcd6da7d1e8b12a21733102",
   "src/compiler/translator/ParseContext_complete_autogen.h":
-    "5d70fc2310654e6bcb04fe27f883b6cd",
+    "b4036c29ee52885005bfbe365a1f071a",
   "src/compiler/translator/SymbolTable_ESSL_autogen.cpp":
-    "de2d78d69330202b3431824a7b82cca5",
+    "c743d336efce0c20ce8bc071ea5e3937",
   "src/compiler/translator/SymbolTable_autogen.cpp":
-    "82e2029363cc5b0b1718801c96961d7a",
+    "f6df7bc35c0880d4e8de59623457a36b",
   "src/compiler/translator/SymbolTable_autogen.h":
     "d43593050c4d1b31b0be9cdd3a2d0ea5",
   "src/compiler/translator/builtin_function_declarations.txt":
@@ -18,13 +18,13 @@
   "src/compiler/translator/builtin_variables.json":
     "a3fa61d753ee97de18b0b53c488bf766",
   "src/compiler/translator/gen_builtin_symbols.py":
-    "eb24e6333408abf3a0e7b42818dce507",
+    "32b985d8ee7a5de6b0d0a19e1b1a3636",
   "src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h":
-    "fb0e00d60b60f6c01b7e75d93c5a1fc3",
+    "ee2d363b9dba94a193c36967f8d84177",
   "src/compiler/translator/tree_util/BuiltIn_complete_autogen.h":
-    "b7ba5f755b1708adc6658351a2ac960c",
+    "3a911a5f2e373904b0bbb79b856397bb",
   "src/tests/compiler_tests/ImmutableString_test_ESSL_autogen.cpp":
-    "19e3e2225d3decd5f212944fa3634abf",
+    "8a8a64cc0a305888ea6585d0d78cc786",
   "src/tests/compiler_tests/ImmutableString_test_autogen.cpp":
-    "e947fe40ee401b2927a5d7832283a676"
+    "60a5bd9eef48bb51035ca09d5ad33564"
 }
\ No newline at end of file

src/compiler/translator/BaseTypes.h

@@ -134,9 +134,6 @@ enum TBasicType
     EbtImage2DMSArray,
     EbtIImage2DMSArray,
     EbtUImage2DMSArray,
-    EbtImage2DRect,
-    EbtIImage2DRect,
-    EbtUImage2DRect,
     EbtImageCubeArray,
     EbtIImageCubeArray,
     EbtUImageCubeArray,
@@ -363,7 +360,6 @@ inline bool IsFloatImage(TBasicType type)
         case EbtImageCube:
         case EbtImage2DMS:
         case EbtImage2DMSArray:
-        case EbtImage2DRect:
         case EbtImageCubeArray:
         case EbtImageRect:
         case EbtImageBuffer:
@@ -388,7 +384,6 @@ inline bool IsIntegerImage(TBasicType type)
         case EbtIImageCube:
         case EbtIImage2DMS:
         case EbtIImage2DMSArray:
-        case EbtIImage2DRect:
         case EbtIImageCubeArray:
         case EbtIImageRect:
         case EbtIImageBuffer:
@@ -413,7 +408,6 @@ inline bool IsUnsignedImage(TBasicType type)
         case EbtUImageCube:
         case EbtUImage2DMS:
         case EbtUImage2DMSArray:
-        case EbtUImage2DRect:
         case EbtUImageCubeArray:
         case EbtUImageRect:
         case EbtUImageBuffer:
@@ -714,9 +708,6 @@ inline bool IsImage2D(TBasicType type)
         case EbtImage2D:
         case EbtIImage2D:
         case EbtUImage2D:
-        case EbtImage2DRect:
-        case EbtIImage2DRect:
-        case EbtUImage2DRect:
         case EbtImage2DMS:
         case EbtIImage2DMS:
         case EbtUImage2DMS:
@@ -785,9 +776,6 @@ inline bool IsImage3D(TBasicType type)
         case EbtImage2DMSArray:
         case EbtIImage2DMSArray:
         case EbtUImage2DMSArray:
-        case EbtImage2DRect:
-        case EbtIImage2DRect:
-        case EbtUImage2DRect:
         case EbtImageCubeArray:
         case EbtIImageCubeArray:
         case EbtUImageCubeArray:
@@ -834,9 +822,6 @@ inline bool IsImage2DArray(TBasicType type)
         case EbtImage2DMS:
         case EbtIImage2DMS:
         case EbtUImage2DMS:
-        case EbtImage2DRect:
-        case EbtIImage2DRect:
-        case EbtUImage2DRect:
         case EbtImageCubeArray:
         case EbtIImageCubeArray:
         case EbtUImageCubeArray:
@@ -883,9 +868,6 @@ inline bool IsImageCube(TBasicType type)
         case EbtImage2DMSArray:
         case EbtIImage2DMSArray:
         case EbtUImage2DMSArray:
-        case EbtImage2DRect:
-        case EbtIImage2DRect:
-        case EbtUImage2DRect:
         case EbtImageCubeArray:
         case EbtIImageCubeArray:
         case EbtUImageCubeArray:

src/compiler/translator/ParseContext_ESSL_autogen.h

@@ -21,77 +21,77 @@ namespace BuiltInGroup
 bool isTextureOffsetNoBias(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3795 && id <= 3864;
+    return id >= 3792 && id <= 3861;
 }
 bool isTextureOffsetBias(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3865 && id <= 3884;
+    return id >= 3862 && id <= 3881;
 }
 bool isTextureGatherOffsetNoComp(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3922 && id <= 3929;
+    return id >= 3919 && id <= 3926;
 }
 bool isTextureGatherOffsetComp(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3930 && id <= 3935;
+    return id >= 3927 && id <= 3932;
 }
 bool isTextureGatherOffset(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3922 && id <= 3935;
+    return id >= 3919 && id <= 3932;
 }
 bool isTextureGatherOffsetsNoComp(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3936 && id <= 3952;
+    return id >= 3933 && id <= 3949;
 }
 bool isTextureGatherOffsetsComp(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3953 && id <= 3964;
+    return id >= 3950 && id <= 3961;
 }
 bool isTextureGatherOffsets(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3936 && id <= 3964;
+    return id >= 3933 && id <= 3961;
 }
 bool isTextureGather(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3898 && id <= 3964;
+    return id >= 3895 && id <= 3961;
 }
 bool isInterpolationFS(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 3977 && id <= 4000;
+    return id >= 3974 && id <= 3997;
 }
 bool isAtomicMemory(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 4005 && id <= 4022;
+    return id >= 4002 && id <= 4019;
 }
 bool isImageStore(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 4059 && id <= 4076;
+    return id >= 4056 && id <= 4073;
 }
 bool isImageLoad(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 4077 && id <= 4094;
+    return id >= 4074 && id <= 4091;
 }
 bool isImageAtomic(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 4095 && id <= 4670;
+    return id >= 4092 && id <= 4667;
 }
 bool isImage(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 4023 && id <= 4670;
+    return id >= 4020 && id <= 4667;
 }
 
 }  // namespace BuiltInGroup

src/compiler/translator/ParseContext_complete_autogen.h

@@ -76,22 +76,22 @@ bool isAtomicMemory(const TFunction *func)
 bool isImageStore(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 1578 && id <= 1613;
+    return id >= 1578 && id <= 1610;
 }
 bool isImageLoad(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 1614 && id <= 1646;
+    return id >= 1611 && id <= 1643;
 }
 bool isImageAtomic(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 1647 && id <= 2768;
+    return id >= 1644 && id <= 2765;
 }
 bool isImage(const TFunction *func)
 {
     int id = func->uniqueId().get();
-    return id >= 1506 && id <= 2768;
+    return id >= 1506 && id <= 2765;
 }
 
 }  // namespace BuiltInGroup

src/compiler/translator/gen_builtin_symbols.py

@@ -492,9 +492,6 @@ basic_types_enumeration = [
     'Image2DMSArray',
     'IImage2DMSArray',
     'UImage2DMSArray',
-    'Image2DRect',
-    'IImage2DRect',
-    'UImage2DRect',
     'ImageCubeArray',
     'IImageCubeArray',
     'UImageCubeArray',
@@ -1331,7 +1328,7 @@ def gen_function_variants(function_props):
         variants = [['gimage2D', 'ivec2'], ['gimage3D', 'ivec3'], ['gimageCube', 'ivec3'],
                     ['gimageBuffer', 'int'], ['gimage2DArray', 'ivec3'],
                     ['gimageCubeArray', 'ivec3'], ['gimage1D', 'int'], ['gimage1DArray', 'ivec2'],
-                    ['gimage2DRect', 'ivec2'], ['gimage2DMS', 'ivec2', 'int'],
+                    ['gimageRect', 'ivec2'], ['gimage2DMS', 'ivec2', 'int'],
                     ['gimage2DMSArray', 'ivec3', 'int']]
         for variant in variants:
             image_variant_parameters = []

src/compiler/translator/tree_ops/vulkan/RewriteR32fImages.cpp

@@ -310,9 +310,6 @@ class RewriteR32fImagesTraverser : public TIntermTraverser
             case EbtImage2DMSArray:
                 newType->setBasicType(EbtUImage2DMSArray);
                 break;
-            case EbtImage2DRect:
-                newType->setBasicType(EbtUImage2DRect);
-                break;
             case EbtImageCubeArray:
                 newType->setBasicType(EbtUImageCubeArray);
                 break;