Author :
Yuxin Hu
Date :
2023-02-03 16:58:21
Hash :e1bd0415 Message :Revert "Re-land fixing of commit ID for Android builds."
This reverts commit e6662832af3c6394d0a0bbecd1e7a52581e88b12.
After the commit
https://github.com/google/angle/commit/61728827d2e5ecce685578bc54bb2c744b65fc9a,
we no longer depends on git hash to determine
if the program binary cache is valid.
The reverted commit was added to handle
unknown git hash. Android build infra does not
guarantee access to git, and we needed
GetANGLEHasBinaryLoading() check because we
can't tell if ANGLE program changed if git hash
remains "unknown" across different builds.
Now that we used a different hash
ANGLE_PROGRAM_VERSION as the cache key, which
generates from a list of code files that affect
program binary content and it won't be unknown
on Android build, we can revert the commit and
rely on ANGLE_PROGRAM_VERSION to reject invalid
program binary cache.
This fixes the dEQP test
dEQP-GLES3.functional.shader_api.program_binary.
simple.uniform_reset_on_binary_load, which failed
because the GetANGLEHasBinaryLoading() is stopping
Program::loadBinary() due to "unknown" git hash
on Android build.
This CL reverts most of the original commit,
cleans up unused macros and variables,
and reserves the change in program::loadBinary()
that returns incomplete if binary format is not
GL_PROGRAM_BINARY_ANGLE. This CL also reserves the
changes in
https://github.com/google/angle/commit/dd8021d98cd2909dfb85012f9b25010bd3ce2536
in case Sumsung parter still needs them.
Bug: b/258445879
Change-Id: Ia4380de9362f7b8bed6de6a54943bec6600cb76b
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4219368
Commit-Queue: Yuxin Hu <yuxinhu@google.com>
Reviewed-by: Roman Lavrov <romanl@google.com>
src/common/angle_version_info.h
//
// Copyright 2021 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// angle_version_info.h: ANGLE version queries.
#ifndef COMMON_VERSION_INFO_H_
#define COMMON_VERSION_INFO_H_
namespace angle
{
int GetANGLERevision();
const char *GetANGLEVersionString();
const char *GetANGLECommitHash();
int GetANGLECommitHashSize();
const char *GetANGLEShaderProgramVersion();
int GetANGLEShaderProgramVersionHashSize();
int GetANGLESHVersion();
} // namespace angle
#endif // COMMON_VERSION_INFO_H_