Skip to content

A
angle
Commit 720ca449 by Jamie Madill Committed by Commit Bot
Options

Pass GN header visibility check.

This fixes a few things: * removes includes that weren't supposed to be present * scopes some compiler code into white_box_perftests * makes version.h/commit and angle_common id more visible * roll zlib to a version that passes check This should help prevent build problems from popping up in the downstream Chromium build. We could also potentially look at including gn check in our CQ recipe. Bug: chromium:915429 Change-Id: I350f543e16de13c84eb2c43260f4966d47185114 Reviewed-on: https://chromium-review.googlesource.com/c/1380771Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 0d218da4
Showing with 90 additions and 97 deletions
BUILD.gn
......@@ -383,6 +383,13 @@ source_set("translator_fuzzer") {
config("commit_id_config") {
include_dirs = [ "$root_gen_dir/angle" ]
visibility = [ ":commit_id" ]
}
source_set("angle_version") {
sources = [
"src/common/version.h",
]
}
commit_id_output_file = "$root_gen_dir/angle/id/commit.h"
......@@ -405,6 +412,9 @@ if (angle_use_commit_id) {
]
public_configs = [ ":commit_id_config" ]
public_deps = [
":angle_version",
]
}
} else {
copy("commit_id") {
......@@ -500,13 +510,13 @@ static_library("libANGLE") {
}
public_deps = [
":angle_common",
":angle_gpu_info_util",
":commit_id",
":translator",
]
deps = [
":angle_gpu_info_util",
":angle_image_util",
":commit_id",
":includes",
":translator",
]
# Shared D3D sources.
......@@ -603,7 +613,6 @@ static_library("libANGLE") {
configs -= angle_undefine_configs
configs += [
":commit_id_config",
":debug_annotations_config",
":extra_warnings",
":internal_config",
......@@ -665,7 +674,6 @@ shared_library("libGLESv2${angle_libs_suffix}") {
configs -= angle_undefine_configs
configs += [
":angle_gl_visibility_config",
":commit_id_config",
":debug_annotations_config",
":extra_warnings",
":internal_config",
......@@ -677,6 +685,10 @@ shared_library("libGLESv2${angle_libs_suffix}") {
":includes",
":libANGLE",
]
public_deps = [
":commit_id",
]
}
static_library("libGLESv2_static") {
......@@ -684,7 +696,6 @@ static_library("libGLESv2_static") {
configs -= angle_undefine_configs
configs += [
":commit_id_config",
":debug_annotations_config",
":extra_warnings",
":internal_config",
......@@ -694,6 +705,9 @@ static_library("libGLESv2_static") {
deps = [
":includes",
]
public_deps = [
":libANGLE",
]
}
......@@ -717,7 +731,6 @@ shared_library("libGLESv1_CM${angle_libs_suffix}") {
configs -= angle_undefine_configs
configs += [
":angle_gl_visibility_config",
":commit_id_config",
":debug_annotations_config",
":extra_warnings",
":internal_config",
......@@ -736,7 +749,6 @@ static_library("libGLESv1_CM_static") {
configs -= angle_undefine_configs
configs += [
":commit_id_config",
":debug_annotations_config",
":extra_warnings",
":internal_config",
......@@ -759,7 +771,6 @@ shared_library("libEGL${angle_libs_suffix}") {
}
configs -= angle_undefine_configs
configs += [
":commit_id_config",
":debug_annotations_config",
":extra_warnings",
":internal_config",
......@@ -785,9 +796,12 @@ shared_library("libEGL${angle_libs_suffix}") {
}
deps = [
":includes",
":libGLESv2${angle_libs_suffix}",
]
public_deps = [
":includes",
]
}
static_library("libEGL_static") {
......@@ -795,7 +809,6 @@ static_library("libEGL_static") {
configs -= angle_undefine_configs
configs += [
":commit_id_config",
":debug_annotations_config",
":extra_warnings",
":internal_config",
......
DEPS
......@@ -109,7 +109,7 @@ deps = {
},
'{angle_root}/third_party/zlib': {
'url': '{chromium_git}/chromium/src/third_party/zlib@c44fb7248079cc3d5563b14b3f758aee60d6b415',
'url': '{chromium_git}/chromium/src/third_party/zlib@f95aeb0fa7f136ef4a457a6d9ba6f3c2701a444b',
'condition': 'not build_with_chromium',
},
......
samples/BUILD.gn
......@@ -28,12 +28,14 @@ static_library("sample_util") {
"sample_util/tga_utils.h",
]
deps = [
"../:angle_common",
"../:angle_util",
"../:libEGL${angle_libs_suffix}",
"../:libGLESv1_CM${angle_libs_suffix}",
"../:libGLESv2${angle_libs_suffix}",
]
public_deps = [
"../:angle_common",
]
public_configs = [ ":sample_util_config" ]
}
......
src/libGLESv2.gni
......@@ -55,7 +55,6 @@ libangle_common_sources = [
"src/common/utilities.cpp",
"src/common/utilities.h",
"src/common/vector_utils.h",
"src/common/version.h",
]
libangle_common_linux_sources = [ "src/common/system_utils_linux.cpp" ]
libangle_common_mac_sources = [ "src/common/system_utils_mac.cpp" ]
......
src/tests/BUILD.gn
......@@ -297,6 +297,7 @@ if (is_win || is_linux || is_android || is_mac) {
sources = angle_perf_tests_sources
deps = googletest_deps + [
angle_root + ":angle_common",
angle_root + ":angle_util_static",
angle_root + ":libEGL${angle_libs_suffix}",
angle_root + ":libGLESv2${angle_libs_suffix}",
......
src/tests/angle_perftests.gni
......@@ -33,9 +33,11 @@ angle_perf_tests_sources = [
"test_utils/angle_test_instantiate.h",
"test_utils/draw_call_perf_utils.cpp",
"test_utils/draw_call_perf_utils.h",
"test_utils/gl_raii.h",
]
angle_white_box_perf_tests_sources = [
"angle_unittests_utils.h",
"perf_tests/ANGLEPerfTest.cpp",
"perf_tests/ANGLEPerfTest.h",
"perf_tests/BitSetIteratorPerf.cpp",
......@@ -48,6 +50,7 @@ angle_white_box_perf_tests_sources = [
"test_utils/angle_test_configs.h",
"test_utils/angle_test_instantiate.cpp",
"test_utils/angle_test_instantiate.h",
"test_utils/gl_raii.h",
]
angle_white_box_perf_tests_win_sources =
......
src/tests/perf_tests/ANGLEPerfTest.cpp
......@@ -10,7 +10,6 @@
#include "ANGLEPerfTest.h"
#include "third_party/perf/perf_test.h"
#include "third_party/trace_event/trace_event.h"
#include "util/shader_utils.h"
#include "util/system_utils.h"
......
src/tests/perf_tests/BitSetIteratorPerf.cpp
......@@ -11,7 +11,6 @@
#include <gmock/gmock.h>
#include "angle_unittests_utils.h"
#include "common/bitset_utils.h"
using namespace testing;
......
src/tests/perf_tests/CompilerPerf.cpp
......@@ -164,16 +164,71 @@ const char *kTrickyESSL300Id = "TrickyESSL300";
constexpr int kNumIterationsPerStep = 4;
struct CompilerPerfParameters final : public angle::CompilerParameters
struct CompilerParameters
{
CompilerParameters() { output = SH_HLSL_4_1_OUTPUT; }
CompilerParameters(ShShaderOutput output) : output(output) {}
const char *str() const
{
switch (output)
{
case SH_HLSL_4_1_OUTPUT:
return "HLSL_4_1";
case SH_GLSL_450_CORE_OUTPUT:
return "GLSL_4_50";
case SH_ESSL_OUTPUT:
return "ESSL";
default:
UNREACHABLE();
return "unk";
}
}
ShShaderOutput output;
};
bool IsPlatformAvailable(const CompilerParameters &param)
{
switch (param.output)
{
case SH_HLSL_4_1_OUTPUT:
case SH_HLSL_4_0_FL9_3_OUTPUT:
case SH_HLSL_3_0_OUTPUT:
{
TPoolAllocator allocator;
InitializePoolIndex();
allocator.push();
SetGlobalPoolAllocator(&allocator);
ShHandle translator =
sh::ConstructCompiler(GL_FRAGMENT_SHADER, SH_WEBGL2_SPEC, param.output);
bool success = translator != nullptr;
SetGlobalPoolAllocator(nullptr);
allocator.pop();
FreePoolIndex();
if (!success)
{
return false;
}
break;
}
default:
break;
}
return true;
}
struct CompilerPerfParameters final : public CompilerParameters
{
CompilerPerfParameters(ShShaderOutput output,
const char *shaderSource,
const char *shaderSourceId)
: angle::CompilerParameters(output), shaderSource(shaderSource)
: CompilerParameters(output), shaderSource(shaderSource)
{
testId = shaderSourceId;
testId += "_";
testId += angle::CompilerParameters::str();
testId += CompilerParameters::str();
}
const char *shaderSource;
......
src/tests/perf_tests/MultiviewPerf.cpp
......@@ -15,7 +15,6 @@
#include "platform/WorkaroundsD3D.h"
#include "shader_utils.h"
#include "test_utils/gl_raii.h"
#include "tests/test_utils/ANGLETest.h"
#include <string.h>
......
src/tests/test_utils/angle_test_configs.cpp
......@@ -9,35 +9,6 @@
namespace angle
{
CompilerParameters::CompilerParameters()
{
output = SH_HLSL_4_1_OUTPUT;
}
CompilerParameters::CompilerParameters(ShShaderOutput output) : output(output) {}
const char *CompilerParameters::str() const
{
switch (output)
{
case SH_HLSL_4_1_OUTPUT:
return "HLSL_4_1";
case SH_GLSL_450_CORE_OUTPUT:
return "GLSL_4_50";
case SH_ESSL_OUTPUT:
return "ESSL";
default:
UNREACHABLE();
return "unk";
}
}
std::ostream &operator<<(std::ostream &stream, const CompilerParameters &p)
{
stream << p.str();
return stream;
}
PlatformParameters::PlatformParameters() : PlatformParameters(2, 0, EGLPlatformParameters()) {}
PlatformParameters::PlatformParameters(EGLint majorVersion,
......
src/tests/test_utils/angle_test_configs.h
......@@ -24,18 +24,6 @@
namespace angle
{
struct CompilerParameters
{
CompilerParameters();
CompilerParameters(ShShaderOutput output);
const char *str() const;
ShShaderOutput output;
};
std::ostream &operator<<(std::ostream &stream, const CompilerParameters &pp);
struct PlatformParameters
{
PlatformParameters();
......
src/tests/test_utils/angle_test_instantiate.cpp
......@@ -14,43 +14,10 @@
#include "EGLWindow.h"
#include "OSWindow.h"
#include "compiler/translator/Compiler.h"
#include "compiler/translator/InitializeGlobals.h"
#include "test_utils/angle_test_configs.h"
namespace angle
{
bool IsPlatformAvailable(const CompilerParameters &param)
{
switch (param.output)
{
case SH_HLSL_4_1_OUTPUT:
case SH_HLSL_4_0_FL9_3_OUTPUT:
case SH_HLSL_3_0_OUTPUT:
{
TPoolAllocator allocator;
InitializePoolIndex();
allocator.push();
SetGlobalPoolAllocator(&allocator);
ShHandle translator =
sh::ConstructCompiler(GL_FRAGMENT_SHADER, SH_WEBGL2_SPEC, param.output);
bool success = translator != nullptr;
SetGlobalPoolAllocator(nullptr);
allocator.pop();
FreePoolIndex();
if (!success)
{
return false;
}
break;
}
default:
break;
}
return true;
}
bool IsPlatformAvailable(const PlatformParameters &param)
{
switch (param.getRenderer())
......
src/tests/test_utils/angle_test_instantiate.h
......@@ -17,11 +17,8 @@
namespace angle
{
struct CompilerParameters;
struct PlatformParameters;
bool IsPlatformAvailable(const CompilerParameters &param);
bool IsPlatformAvailable(const PlatformParameters &param);
// This functions is used to filter which tests should be registered,
......
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