Commit 4b80fbc8 by Shahbaz Youssefi Committed by Commit Bot

Fix textureGatherOffsets classification

sampler2DRect was placed under ESSL while sampler2DArrayShadow was placed under desktop GLSL. They are swapped. Bug: angleproject:3569 Change-Id: Ibf39868d4cd702d9d1da7fc286171bb70b80d6df Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1975430Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent 6423b7fc
{ {
"src/compiler/translator/ImmutableString_ESSL_autogen.cpp": "src/compiler/translator/ImmutableString_ESSL_autogen.cpp":
"2e3a14450cce8f36e4b44a0abf24957d", "04c99d881c37b835817eb56d2360b935",
"src/compiler/translator/ImmutableString_autogen.cpp": "src/compiler/translator/ImmutableString_autogen.cpp":
"f024bd2fea774939a99b9d035488f60c", "c48781801bc54a3c6d3c4dc8a9ac9f7b",
"src/compiler/translator/ParseContext_ESSL_autogen.h": "src/compiler/translator/ParseContext_ESSL_autogen.h":
"556a225de28133d2e9d8b8fa49aa102a", "082e0de86e1d4aa7ce38e8721f7e9e7a",
"src/compiler/translator/ParseContext_complete_autogen.h": "src/compiler/translator/ParseContext_complete_autogen.h":
"59554780ac5a719c459a359aebe5bec5", "2781c026f8561561963609f41dc3d19b",
"src/compiler/translator/SymbolTable_ESSL_autogen.cpp": "src/compiler/translator/SymbolTable_ESSL_autogen.cpp":
"c68d34bd83aae0eb64c554e5ad0fe79a", "50c55d27eeb01feb658d6603f0871dcd",
"src/compiler/translator/SymbolTable_autogen.cpp": "src/compiler/translator/SymbolTable_autogen.cpp":
"6a592e01e11a98dcf42d52412aa24f50", "a340694ac13857e2554b34e301e87acb",
"src/compiler/translator/SymbolTable_autogen.h": "src/compiler/translator/SymbolTable_autogen.h":
"3ce7740b6ad93a86d198c3937b70c17e", "3ce7740b6ad93a86d198c3937b70c17e",
"src/compiler/translator/builtin_function_declarations.txt": "src/compiler/translator/builtin_function_declarations.txt":
"1f0a9ad84cf73f83e3f4e2fa8d6741a2", "ef7425b5ef3b95c14ad32ea676f9eb92",
"src/compiler/translator/builtin_variables.json": "src/compiler/translator/builtin_variables.json":
"1b71075ff2644fd32b12bb53dce50062", "1b71075ff2644fd32b12bb53dce50062",
"src/compiler/translator/gen_builtin_symbols.py": "src/compiler/translator/gen_builtin_symbols.py":
"f8b91bb0a1420164b322156bc224aaef", "f8b91bb0a1420164b322156bc224aaef",
"src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h": "src/compiler/translator/tree_util/BuiltIn_ESSL_autogen.h":
"677f656b0be4a8117702372a87126058", "4bdd0602e77653ebed7182a5252482cd",
"src/compiler/translator/tree_util/BuiltIn_complete_autogen.h": "src/compiler/translator/tree_util/BuiltIn_complete_autogen.h":
"daac185d5e849bab2fb514b796f65a58", "4e11b044148d46d32d3bea667b583ecd",
"src/tests/compiler_tests/ImmutableString_test_ESSL_autogen.cpp": "src/tests/compiler_tests/ImmutableString_test_ESSL_autogen.cpp":
"a611ebe34c90859e88fc98d0e7f64154", "c17f3f6e89c00c46c7f692ee85a54153",
"src/tests/compiler_tests/ImmutableString_test_autogen.cpp": "src/tests/compiler_tests/ImmutableString_test_autogen.cpp":
"ed6cfd15c769daada0d681df106c0a32" "67182194afadb4adb981fcf2db2126b2"
} }
\ No newline at end of file
...@@ -21,67 +21,67 @@ namespace BuiltInGroup ...@@ -21,67 +21,67 @@ namespace BuiltInGroup
bool isTextureOffsetNoBias(const TFunction *func) bool isTextureOffsetNoBias(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3048 && id <= 3117; return id >= 3046 && id <= 3115;
} }
bool isTextureOffsetBias(const TFunction *func) bool isTextureOffsetBias(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3118 && id <= 3137; return id >= 3116 && id <= 3135;
} }
bool isTextureGatherOffsetsComp(const TFunction *func) bool isTextureGatherOffsetsComp(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3175 && id <= 3187; return id >= 3173 && id <= 3185;
} }
bool isTextureGatherOffsetsNoComp(const TFunction *func) bool isTextureGatherOffsetsNoComp(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3188 && id <= 3209; return id >= 3186 && id <= 3201;
} }
bool isTextureGatherOffsets(const TFunction *func) bool isTextureGatherOffsets(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3175 && id <= 3209; return id >= 3173 && id <= 3201;
} }
bool isTextureGatherOffsetComp(const TFunction *func) bool isTextureGatherOffsetComp(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3210 && id <= 3215; return id >= 3202 && id <= 3207;
} }
bool isTextureGatherOffsetNoComp(const TFunction *func) bool isTextureGatherOffsetNoComp(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3216 && id <= 3223; return id >= 3208 && id <= 3215;
} }
bool isTextureGatherOffset(const TFunction *func) bool isTextureGatherOffset(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3210 && id <= 3223; return id >= 3202 && id <= 3215;
} }
bool isTextureGather(const TFunction *func) bool isTextureGather(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3151 && id <= 3223; return id >= 3149 && id <= 3215;
} }
bool isAtomicMemory(const TFunction *func) bool isAtomicMemory(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3240 && id <= 3257; return id >= 3232 && id <= 3249;
} }
bool isImageLoad(const TFunction *func) bool isImageLoad(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3282 && id <= 3293; return id >= 3274 && id <= 3285;
} }
bool isImageStore(const TFunction *func) bool isImageStore(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3294 && id <= 3305; return id >= 3286 && id <= 3297;
} }
bool isImage(const TFunction *func) bool isImage(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 3258 && id <= 3305; return id >= 3250 && id <= 3297;
} }
} // namespace BuiltInGroup } // namespace BuiltInGroup
......
...@@ -36,52 +36,52 @@ bool isTextureGatherOffsetsComp(const TFunction *func) ...@@ -36,52 +36,52 @@ bool isTextureGatherOffsetsComp(const TFunction *func)
bool isTextureGatherOffsetsNoComp(const TFunction *func) bool isTextureGatherOffsetsNoComp(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1366 && id <= 1387; return id >= 1366 && id <= 1385;
} }
bool isTextureGatherOffsets(const TFunction *func) bool isTextureGatherOffsets(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1350 && id <= 1387; return id >= 1350 && id <= 1385;
} }
bool isTextureGatherOffsetComp(const TFunction *func) bool isTextureGatherOffsetComp(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1388 && id <= 1396; return id >= 1386 && id <= 1394;
} }
bool isTextureGatherOffsetNoComp(const TFunction *func) bool isTextureGatherOffsetNoComp(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1397 && id <= 1408; return id >= 1395 && id <= 1406;
} }
bool isTextureGatherOffset(const TFunction *func) bool isTextureGatherOffset(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1388 && id <= 1408; return id >= 1386 && id <= 1406;
} }
bool isTextureGather(const TFunction *func) bool isTextureGather(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1312 && id <= 1408; return id >= 1312 && id <= 1406;
} }
bool isAtomicMemory(const TFunction *func) bool isAtomicMemory(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1470 && id <= 1487; return id >= 1468 && id <= 1485;
} }
bool isImageLoad(const TFunction *func) bool isImageLoad(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 2124 && id <= 2156; return id >= 2122 && id <= 2154;
} }
bool isImageStore(const TFunction *func) bool isImageStore(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 2157 && id <= 2189; return id >= 2155 && id <= 2187;
} }
bool isImage(const TFunction *func) bool isImage(const TFunction *func)
{ {
int id = func->uniqueId().get(); int id = func->uniqueId().get();
return id >= 1488 && id <= 2189; return id >= 1486 && id <= 2187;
} }
} // namespace BuiltInGroup } // namespace BuiltInGroup
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -903,15 +903,15 @@ GROUP BEGIN TextureGather {"queryFunction": true} ...@@ -903,15 +903,15 @@ GROUP BEGIN TextureGather {"queryFunction": true}
DEFAULT METADATA {"essl_level": "ESSL3_2_BUILTINS", "glsl_level": "GLSL4_BUILTINS", "op": "CallBuiltInFunction"} DEFAULT METADATA {"essl_level": "ESSL3_2_BUILTINS", "glsl_level": "GLSL4_BUILTINS", "op": "CallBuiltInFunction"}
gvec4 textureGatherOffsets(gsampler2D, vec2, ivec2[4]); gvec4 textureGatherOffsets(gsampler2D, vec2, ivec2[4]);
gvec4 textureGatherOffsets(gsampler2DArray, vec3, ivec2[4]); gvec4 textureGatherOffsets(gsampler2DArray, vec3, ivec2[4]);
gvec4 textureGatherOffsets(gsampler2DRect, vec2, ivec2[4]);
vec4 textureGatherOffsets(sampler2DShadow, vec2, float, ivec2[4]); vec4 textureGatherOffsets(sampler2DShadow, vec2, float, ivec2[4]);
vec4 textureGatherOffsets(sampler2DArrayShadow, vec3, float, ivec2[4]);
DEFAULT METADATA {"essl_level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction", "essl_extension": "EXT_gpu_shader5", "suffix": "Ext"} DEFAULT METADATA {"essl_level": "ESSL3_1_BUILTINS", "op": "CallBuiltInFunction", "essl_extension": "EXT_gpu_shader5", "suffix": "Ext"}
gvec4 textureGatherOffsets(gsampler2D, vec2, ivec2[4]); gvec4 textureGatherOffsets(gsampler2D, vec2, ivec2[4]);
gvec4 textureGatherOffsets(gsampler2DArray, vec3, ivec2[4]); gvec4 textureGatherOffsets(gsampler2DArray, vec3, ivec2[4]);
gvec4 textureGatherOffsets(gsampler2DRect, vec2, ivec2[4]);
vec4 textureGatherOffsets(sampler2DShadow, vec2, float, ivec2[4]); vec4 textureGatherOffsets(sampler2DShadow, vec2, float, ivec2[4]);
DEFAULT METADATA {"glsl_level": "GLSL4_BUILTINS", "op": "CallBuiltInFunction"}
vec4 textureGatherOffsets(sampler2DArrayShadow, vec3, float, ivec2[4]); vec4 textureGatherOffsets(sampler2DArrayShadow, vec3, float, ivec2[4]);
DEFAULT METADATA {"glsl_level": "GLSL4_BUILTINS", "op": "CallBuiltInFunction"}
gvec4 textureGatherOffsets(gsampler2DRect, vec2, ivec2[4]);
vec4 textureGatherOffsets(sampler2DRectShadow, vec2, float, ivec2[4]); vec4 textureGatherOffsets(sampler2DRectShadow, vec2, float, ivec2[4]);
GROUP END NoComp GROUP END NoComp
GROUP BEGIN Comp {"queryFunction": true} GROUP BEGIN Comp {"queryFunction": true}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment