Skip to content

A
angle
Commit 9528641b by Jamie Madill Committed by Commit Bot
Options

EGL: Generalize the entry point enum.

This both generalizes the GL entry point enum to include other APIs like EGL and inserts the EGL and WGL entry points into the enum. This will faciliate EGL entry point auto-generation and also frame capture for EGL entry points. Bug: angleproject:2621 Change-Id: Iaf4310e03b3d55839dd1328362fb29dcef918fab Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2555861 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent bccaaffd
Showing with 248 additions and 252 deletions
BUILD.gn
......@@ -289,13 +289,6 @@ config("angle_no_cfi_unrelated_cast") {
}
}
angle_source_set("angle_system_utils") {
sources = angle_system_utils_sources
if (is_linux || is_chromeos) {
libs = [ "dl" ]
}
}
angle_source_set("xxhash") {
sources = xxhash_sources
if (is_clang) {
......@@ -322,7 +315,6 @@ angle_static_library("angle_common") {
public_deps = [
":angle_abseil",
":angle_system_utils",
":angle_version",
":includes",
]
......@@ -331,6 +323,10 @@ angle_static_library("angle_common") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
if (is_linux || is_chromeos) {
libs = [ "dl" ]
}
if (is_android && (angle_enable_gl || angle_enable_vulkan)) {
# In API level 26 ANativeWindow APIs were moved from libandroid.so
# into a separate library, libnativewindow.so
......@@ -1053,7 +1049,6 @@ angle_shared_library("libEGL") {
deps = [
":angle_common",
":angle_system_utils",
":angle_version",
":libEGL_egl_loader",
]
......
scripts/code_generation_hashes/GL_EGL_entry_points.json
......@@ -8,7 +8,7 @@
"scripts/entry_point_packed_gl_enums.json":
"846be5dc8cb36076207699b025633fcc",
"scripts/generate_entry_points.py":
"50fe62b18f729613a66b7343737db188",
"bb94fd89ca25c807c3ec622d1d0c5e82",
"scripts/gl.xml":
"f66967f3f3d696b5d8306fd80bbd49a8",
"scripts/gl_angle_ext.xml":
......@@ -18,9 +18,9 @@
"scripts/wgl.xml":
"c36001431919e1c435f1215a85f7e1db",
"src/common/entry_points_enum_autogen.cpp":
"c2d9b042b091aa0f198d023547ee02b5",
"03ba77bead4d849bf18f68d98b629ea2",
"src/common/entry_points_enum_autogen.h":
"88eaa3ca15b860b6ac223e4da540d3b2",
"ec4412660757ad500bf4c4aa5872b5b8",
"src/libANGLE/Context_gl_1_0_autogen.h":
"fa315eea66889530dcca311d90490d3b",
"src/libANGLE/Context_gl_1_1_autogen.h":
......@@ -72,31 +72,31 @@
"src/libANGLE/Context_gles_ext_autogen.h":
"cc05cbb1ceb71c40f89ede91f394f682",
"src/libANGLE/capture_gles_1_0_autogen.cpp":
"1ee3e4aceb1afa9585aa458c600665a9",
"0655870b47c6839e46c4e8b0b89be1f9",
"src/libANGLE/capture_gles_1_0_autogen.h":
"546173090c85ad28a580ca76cd117484",
"src/libANGLE/capture_gles_2_0_autogen.cpp":
"d512df459dbc2e61f26c2ebb5330eba8",
"78701e22a3fa82c18f02b3a1951f62bf",
"src/libANGLE/capture_gles_2_0_autogen.h":
"6985d5e3d0126bc8e02dd982267a904f",
"src/libANGLE/capture_gles_3_0_autogen.cpp":
"6447ab4c579f717a25f86ce3815e49c3",
"b8809b1ebaa98564194144113e27a39d",
"src/libANGLE/capture_gles_3_0_autogen.h":
"b963fec070e0becdcf4af69216cd1c7b",
"src/libANGLE/capture_gles_3_1_autogen.cpp":
"3cd86e846ed49e68f149805a0ddfea8d",
"af353035ef38dd953f35630fb6e1d3ae",
"src/libANGLE/capture_gles_3_1_autogen.h":
"3d363f4de97b47ecff61e29939dcf11a",
"src/libANGLE/capture_gles_3_2_autogen.cpp":
"5b761dc394b15edeb077fa31faacf083",
"110d08a5368399511f8ef4f3aed5461b",
"src/libANGLE/capture_gles_3_2_autogen.h":
"3d8f561944c8e5c06c7c9e68559ff364",
"src/libANGLE/capture_gles_ext_autogen.cpp":
"25fbe0477efc993f0b099a94aec01d71",
"75ee3aaae546f2ac9bd9da7da7fdcc2b",
"src/libANGLE/capture_gles_ext_autogen.h":
"d2e205204a7a4dd22e953398503506f0",
"src/libANGLE/frame_capture_replay_autogen.cpp":
"09901bfdd8b16c9e888380179b53aa7a",
"e5492a4ebe8a616db1a4a9397c7fff1c",
"src/libANGLE/frame_capture_utils_autogen.cpp":
"442ed8cd644833c56ff5e50083e3d94d",
"src/libANGLE/frame_capture_utils_autogen.h":
......@@ -158,79 +158,79 @@
"src/libEGL/libEGL_autogen.def":
"3f504d6280dc1d847bc2dedc51fa2640",
"src/libGL/entry_points_gl_1_0_autogen.cpp":
"cb974a5a4230f15b0de83a3f690dc481",
"28eb68b531e649ecf40b06fcab9765b0",
"src/libGL/entry_points_gl_1_0_autogen.h":
"4ff00afc21780bc6c138b5431a2d067c",
"src/libGL/entry_points_gl_1_1_autogen.cpp":
"25b8fa135fd328dc5781e7acac15f2c1",
"9596ad7a8efea9eb6d089042c91039e5",
"src/libGL/entry_points_gl_1_1_autogen.h":
"570a839bb336d8f5f83d3b50fe49411a",
"src/libGL/entry_points_gl_1_2_autogen.cpp":
"df1563b8fc606f9d4d7022e1ed2aa8ba",
"6c5a7f3a303fa601c9c13b93aca71b7d",
"src/libGL/entry_points_gl_1_2_autogen.h":
"3f52187f299fe96672384e1646f4a1cb",
"src/libGL/entry_points_gl_1_3_autogen.cpp":
"d536065308f2b67bb043e04a70f31f6f",
"4fdfdaf00b1e93ceae26ab7731c453f1",
"src/libGL/entry_points_gl_1_3_autogen.h":
"5ea36d869b82a824d5f290625c4ea052",
"src/libGL/entry_points_gl_1_4_autogen.cpp":
"489b169ac60632b44335e0ce3f20dd19",
"74c028f76e5aa106742510c58e86730d",
"src/libGL/entry_points_gl_1_4_autogen.h":
"2c5d31ca248507a024e4724c74283ec4",
"src/libGL/entry_points_gl_1_5_autogen.cpp":
"c3b20077ff54e2148f687d4654364cd8",
"875fcc7d7f7067e19dbc754c5d72610a",
"src/libGL/entry_points_gl_1_5_autogen.h":
"978457aa9a40e427846b6dea24608903",
"src/libGL/entry_points_gl_2_0_autogen.cpp":
"327055976b3009f2cffb4129efddaca5",
"3addc02c89691aed9a3ff71905b1ba22",
"src/libGL/entry_points_gl_2_0_autogen.h":
"41b0cd064167fac84bcdb1896a275b1b",
"src/libGL/entry_points_gl_2_1_autogen.cpp":
"a91d1832697d6ebd8789ff4831615b0a",
"a5c773c069edcde80dd825d2da13a994",
"src/libGL/entry_points_gl_2_1_autogen.h":
"1da48dec560ea5ff8cadf4d0b6bfde1c",
"src/libGL/entry_points_gl_3_0_autogen.cpp":
"100ea68ec10b12ae445683fa616e8ad4",
"723acbee3f2ca25474965e948b8f49ac",
"src/libGL/entry_points_gl_3_0_autogen.h":
"0fad8005f23815beb8ee9b3797c00b83",
"src/libGL/entry_points_gl_3_1_autogen.cpp":
"fcfdbb2add1da66c7812c670fe1ff4bc",
"035d3b50c22fecd29af8224beb71b0a8",
"src/libGL/entry_points_gl_3_1_autogen.h":
"a68ff6c69f0ce95d9730e22bb4c63366",
"src/libGL/entry_points_gl_3_2_autogen.cpp":
"50befe764d78c30f1cbc4734dca23809",
"3038b5070ed7f14809a434702a23d76e",
"src/libGL/entry_points_gl_3_2_autogen.h":
"f162c4e93a64ab2e43048a0937f7c46f",
"src/libGL/entry_points_gl_3_3_autogen.cpp":
"ca18f0aebac8485a074174b758a854e5",
"b7bc975504fbde8f35fb69d435c83ab6",
"src/libGL/entry_points_gl_3_3_autogen.h":
"51c0e4f074c85447f5d910c63b9ea61c",
"src/libGL/entry_points_gl_4_0_autogen.cpp":
"9f81556e90b50859614d69d7d0162c2d",
"c9a61abc9dbd97f5d6ada4eded714c3d",
"src/libGL/entry_points_gl_4_0_autogen.h":
"35d611138951cebc29db99c9bf3a9e5f",
"src/libGL/entry_points_gl_4_1_autogen.cpp":
"c72f43ffdafddddaedbfc810c249ede5",
"68b0f527d5cf4c5402d14a8b4f62f8aa",
"src/libGL/entry_points_gl_4_1_autogen.h":
"beec6659a3a77695dad66df90717c6ba",
"src/libGL/entry_points_gl_4_2_autogen.cpp":
"cbc5d16252560a1102e8bbf8835d780c",
"bdb4fce60f2bdf2af14b4c7d936a6cf2",
"src/libGL/entry_points_gl_4_2_autogen.h":
"a2cb2a48cceaf6131f96bf8ec556aa55",
"src/libGL/entry_points_gl_4_3_autogen.cpp":
"8fb2ed33a82ce2dfe4333305c63bd79c",
"bf5340938b34e58b0433549f5a6466b8",
"src/libGL/entry_points_gl_4_3_autogen.h":
"abfa431742a2b643db21220944e10ab0",
"src/libGL/entry_points_gl_4_4_autogen.cpp":
"8565d56889a0ce6c087c2b6133fbd2fd",
"5254bb09a79af636741043679c7188e0",
"src/libGL/entry_points_gl_4_4_autogen.h":
"cdf1651f00d26db547b153afc09acc1c",
"src/libGL/entry_points_gl_4_5_autogen.cpp":
"dc051b47e0cf2c44bfb4a5177a6fdbef",
"24f4a6d48d0543baf16f20c54a80e485",
"src/libGL/entry_points_gl_4_5_autogen.h":
"9f5de9513c06b82aca60856860f7b716",
"src/libGL/entry_points_gl_4_6_autogen.cpp":
"7d3b31a7f6e1c457540f14669d7025f5",
"182d7f22fd884e30d3796cc17fc345c5",
"src/libGL/entry_points_gl_4_6_autogen.h":
"ee3150d4a8d267271a02e38e8feb923a",
"src/libGL/libGL_autogen.cpp":
......@@ -242,27 +242,27 @@
"src/libGLESv2/entry_points_egl_ext_autogen.h":
"9154781afd9bd6354ec6fc201b43c790",
"src/libGLESv2/entry_points_gles_1_0_autogen.cpp":
"3e96283f3ebd6428e0e7c04a7e38db14",
"11728cb449ab267e6515bae9e75e1499",
"src/libGLESv2/entry_points_gles_1_0_autogen.h":
"899dcff9383465380f94fbdfe5bcf0a0",
"src/libGLESv2/entry_points_gles_2_0_autogen.cpp":
"437816f35190f56d1a1658e79cdb60b0",
"3da7e3b668f53bc3503d9aa65471ed13",
"src/libGLESv2/entry_points_gles_2_0_autogen.h":
"26387e27cbddf5e34d6cd9f850cb8b64",
"src/libGLESv2/entry_points_gles_3_0_autogen.cpp":
"39c316c6dbc9a9c2d1ea04bc6a73a4f6",
"28f3c1c4bce7cabeb7e0d738ce8b8465",
"src/libGLESv2/entry_points_gles_3_0_autogen.h":
"0d246024379fbf55b87204db5d6a37e3",
"src/libGLESv2/entry_points_gles_3_1_autogen.cpp":
"3b1106dee3086c98baba6f54bd7f987c",
"11c604313bf22efe71eff47f5be0a682",
"src/libGLESv2/entry_points_gles_3_1_autogen.h":
"69bae5c94ed4665836a8464b6c353f9a",
"src/libGLESv2/entry_points_gles_3_2_autogen.cpp":
"c3a29c34f8cb1308ce156c948bf520ac",
"a211ca4f8ddcb7165caa4b3c8c7d47ca",
"src/libGLESv2/entry_points_gles_3_2_autogen.h":
"5798aa0a73af1d4ba5dfe99b6217a247",
"src/libGLESv2/entry_points_gles_ext_autogen.cpp":
"e756ae01a0b54eaee4b222cac78c8e4c",
"fdbdace04f00644597a0a0921003a645",
"src/libGLESv2/entry_points_gles_ext_autogen.h":
"5076b144ea0e7acf77bd2a0078588716",
"src/libGLESv2/libGLESv2_autogen.cpp":
......
scripts/generate_entry_points.py
......@@ -95,7 +95,7 @@ TEMPLATE_ENTRY_POINTS_ENUM_HEADER = """\
#ifndef COMMON_ENTRYPOINTSENUM_AUTOGEN_H_
#define COMMON_ENTRYPOINTSENUM_AUTOGEN_H_
namespace gl
namespace angle
{{
enum class EntryPoint
{{
......@@ -103,13 +103,13 @@ enum class EntryPoint
}};
const char *GetEntryPointName(EntryPoint ep);
}} // namespace gl
}} // namespace angle
#endif // COMMON_ENTRY_POINTS_ENUM_AUTOGEN_H_
"""
TEMPLATE_ENTRY_POINTS_NAME_CASE = """\
case EntryPoint::{enum}:
return "gl{enum}";"""
return "{cmd}";"""
TEMPLATE_ENTRY_POINTS_ENUM_SOURCE = """\
// GENERATED FILE - DO NOT EDIT.
......@@ -126,7 +126,7 @@ TEMPLATE_ENTRY_POINTS_ENUM_SOURCE = """\
#include "common/debug.h"
namespace gl
namespace angle
{{
const char *GetEntryPointName(EntryPoint ep)
{{
......@@ -138,7 +138,7 @@ const char *GetEntryPointName(EntryPoint ep)
return "error";
}}
}}
}} // namespace gl
}} // namespace angle
"""
TEMPLATE_LIB_ENTRY_POINT_SOURCE = """\
......@@ -163,7 +163,7 @@ TEMPLATE_ENTRY_POINT_NO_RETURN = """\
void GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params})
{{
Context *context = {context_getter};
{event_comment}EVENT(context, gl::EntryPoint::{name}, "gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
{event_comment}EVENT(context, GL{name}, "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
if ({valid_context_check})
{{{assert_explicit_context}{packed_gl_enum_conversions}
......@@ -186,7 +186,7 @@ TEMPLATE_ENTRY_POINT_WITH_RETURN = """\
{return_type}GL_APIENTRY {name}{explicit_context_suffix}({explicit_context_param}{explicit_context_comma}{params})
{{
Context *context = {context_getter};
{event_comment}EVENT(context, gl::EntryPoint::{name}, "gl{name}", "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
{event_comment}EVENT(context, GL{name}, "context = %d{comma_if_needed}{format_params}", CID(context){comma_if_needed}{pass_params});
{return_type} returnValue;
if ({valid_context_check})
......@@ -199,14 +199,14 @@ TEMPLATE_ENTRY_POINT_WITH_RETURN = """\
}}
else
{{
returnValue = GetDefaultReturnValue<EntryPoint::{name}, {return_type}>();
}}
returnValue = GetDefaultReturnValue<angle::EntryPoint::GL{name}, {return_type}>();
}}
ANGLE_CAPTURE({name}, isCallValid, {validate_params}, returnValue);
}}
else
{{
{constext_lost_error_generator}
returnValue = GetDefaultReturnValue<EntryPoint::{name}, {return_type}>();
returnValue = GetDefaultReturnValue<angle::EntryPoint::GL{name}, {return_type}>();
}}
return returnValue;
}}
......@@ -380,7 +380,7 @@ CallCapture Capture{short_name}({params_with_type}, {return_value_type_original}
InitParamValue(ParamType::T{return_value_type_custom}, returnValue, &returnValueCapture.value);
paramBuffer.addReturnValue(std::move(returnValueCapture));
return CallCapture(gl::EntryPoint::{short_name}, std::move(paramBuffer));
return CallCapture(angle::EntryPoint::GL{short_name}, std::move(paramBuffer));
}}
"""
......@@ -391,7 +391,7 @@ CallCapture Capture{short_name}({params_with_type})
{parameter_captures}
return CallCapture(gl::EntryPoint::{short_name}, std::move(paramBuffer));
return CallCapture(angle::EntryPoint::GL{short_name}, std::move(paramBuffer));
}}
"""
......@@ -458,7 +458,7 @@ void FrameCapture::ReplayCall(gl::Context *context,
"""
TEMPLATE_CAPTURE_REPLAY_CALL_CASE = """case gl::EntryPoint::{entry_point}:
TEMPLATE_CAPTURE_REPLAY_CALL_CASE = """case angle::EntryPoint::GL{entry_point}:
context->{context_call}({param_value_access});break;"""
STATIC_CAST_TO_DICT = {
......@@ -940,7 +940,7 @@ def script_relative(path):
def strip_api_prefix(cmd_name):
return cmd_name.lstrip("egl")
return cmd_name.lstrip("wegl")
def format_entry_point_decl(api, cmd_name, proto, params, is_explicit_context):
......@@ -2498,20 +2498,21 @@ def main():
write_context_api_decls(CONTEXT_HEADER, gldecls, "gl")
# Entry point enum
cmd_names = ["Invalid"
] + [strip_api_prefix(cmd) for cmd in xml.all_cmd_names.get_all_commands()]
egl_cmd_names = [strip_api_prefix(cmd) for cmd in eglxml.all_cmd_names.get_all_commands()]
gles_cmd_names = ["Invalid"
] + [strip_api_prefix(cmd) for cmd in xml.all_cmd_names.get_all_commands()]
gl_cmd_names = [strip_api_prefix(cmd) for cmd in glxml.all_cmd_names.get_all_commands()]
cmd_names.extend([cmd for cmd in gl_cmd_names if cmd not in cmd_names])
sorted_cmd_names = sorted(cmd_names)
# Ensure there are no duplicates
assert (len(sorted_cmd_names) == len(set(sorted_cmd_names))), "Duplicate command names found"
wgl_cmd_names = [strip_api_prefix(cmd) for cmd in wglxml.all_cmd_names.get_all_commands()]
unsorted_enums = [("EGL%s" % cmd, "egl%s" % cmd) for cmd in egl_cmd_names] + [
("GL%s" % cmd, "gl%s" % cmd) for cmd in set(gles_cmd_names + gl_cmd_names)
] + [("WGL%s" % cmd, "wgl%s" % cmd) for cmd in wgl_cmd_names]
all_enums = sorted(unsorted_enums)
entry_points_enum_header = TEMPLATE_ENTRY_POINTS_ENUM_HEADER.format(
script_name=os.path.basename(sys.argv[0]),
data_source_name="gl.xml and gl_angle_ext.xml",
lib="GL/GLES",
entry_points_list=",\n".join([" " + cmd for cmd in sorted_cmd_names]))
entry_points_list=",\n".join([" " + enum for (enum, _) in all_enums]))
entry_points_enum_header_path = path_to("common", "entry_points_enum_autogen.h")
with open(entry_points_enum_header_path, "w") as out:
......@@ -2519,7 +2520,7 @@ def main():
out.close()
entry_points_cases = [
TEMPLATE_ENTRY_POINTS_NAME_CASE.format(enum=cmd) for cmd in sorted_cmd_names
TEMPLATE_ENTRY_POINTS_NAME_CASE.format(enum=enum, cmd=cmd) for (enum, cmd) in all_enums
]
entry_points_enum_source = TEMPLATE_ENTRY_POINTS_ENUM_SOURCE.format(
script_name=os.path.basename(sys.argv[0]),
......
src/common/debug.cpp
......@@ -129,7 +129,7 @@ std::mutex &GetDebugMutex()
return *g_debugMutex;
}
ScopedPerfEventHelper::ScopedPerfEventHelper(gl::Context *context, gl::EntryPoint entryPoint)
ScopedPerfEventHelper::ScopedPerfEventHelper(gl::Context *context, angle::EntryPoint entryPoint)
: mContext(context), mEntryPoint(entryPoint), mFunctionName(nullptr)
{}
......
src/common/debug.h
......@@ -20,6 +20,7 @@
#include <string>
#include "common/angleutils.h"
#include "common/entry_points_enum_autogen.h"
#include "common/platform.h"
#if !defined(TRACE_OUTPUT_FILE)
......@@ -29,20 +30,19 @@
namespace gl
{
class Context;
enum class EntryPoint;
// Pairs a D3D begin event with an end event.
class ScopedPerfEventHelper : angle::NonCopyable
{
public:
ScopedPerfEventHelper(gl::Context *context, gl::EntryPoint entryPoint);
ScopedPerfEventHelper(Context *context, angle::EntryPoint entryPoint);
~ScopedPerfEventHelper();
ANGLE_FORMAT_PRINTF(2, 3)
void begin(const char *format, ...);
private:
gl::Context *mContext;
const gl::EntryPoint mEntryPoint;
const angle::EntryPoint mEntryPoint;
const char *mFunctionName;
};
......@@ -93,14 +93,14 @@ class DebugAnnotator : angle::NonCopyable
DebugAnnotator() {}
virtual ~DebugAnnotator() {}
virtual void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
angle::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) = 0;
const char *eventMessage) = 0;
virtual void endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint) = 0;
virtual void setMarker(const char *markerName) = 0;
virtual bool getStatus() = 0;
angle::EntryPoint entryPoint) = 0;
virtual void setMarker(const char *markerName) = 0;
virtual bool getStatus() = 0;
// Log Message Handler that gets passed every log message,
// when debug annotations are initialized,
// replacing default handling by LogMessage.
......@@ -256,26 +256,31 @@ std::ostream &FmtHex(std::ostream &os, T value)
// A macro to log a performance event around a scope.
#if defined(ANGLE_TRACE_ENABLED)
# if defined(_MSC_VER)
# define EVENT(context, entryPoint, function, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper##__LINE__(context, entryPoint); \
do \
{ \
if (gl::ShouldBeginScopedEvent()) \
{ \
scopedPerfEventHelper##__LINE__.begin("%s(" message ")", function, \
__VA_ARGS__); \
} \
} while (0)
# else
# define EVENT(context, entryPoint, function, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper(context, entryPoint); \
# define EVENT(context, entryPoint, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper##__LINE__( \
context, angle::EntryPoint::entryPoint); \
do \
{ \
if (gl::ShouldBeginScopedEvent()) \
{ \
scopedPerfEventHelper.begin("%s(" message ")", function, ##__VA_ARGS__); \
scopedPerfEventHelper##__LINE__.begin( \
"%s(" message ")", GetEntryPointName(angle::EntryPoint::entryPoint), \
__VA_ARGS__); \
} \
} while (0)
# else
# define EVENT(context, entryPoint, message, ...) \
gl::ScopedPerfEventHelper scopedPerfEventHelper(context, \
angle::EntryPoint::entryPoint); \
do \
{ \
if (gl::ShouldBeginScopedEvent()) \
{ \
scopedPerfEventHelper.begin("%s(" message ")", \
GetEntryPointName(angle::EntryPoint::entryPoint), \
##__VA_ARGS__); \
} \
} while (0)
# endif // _MSC_VER
#else
# define EVENT(message, ...) (void(0))
......
src/common/entry_points_enum_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libANGLE/FrameCapture.h
......@@ -96,7 +96,7 @@ class ParamBuffer final : angle::NonCopyable
struct CallCapture
{
CallCapture(gl::EntryPoint entryPointIn, ParamBuffer &&paramsIn);
CallCapture(EntryPoint entryPointIn, ParamBuffer &&paramsIn);
CallCapture(const std::string &customFunctionNameIn, ParamBuffer &&paramsIn);
~CallCapture();
......@@ -105,7 +105,7 @@ struct CallCapture
const char *name() const;
gl::EntryPoint entryPoint;
EntryPoint entryPoint;
std::string customFunctionName;
ParamBuffer params;
};
......@@ -171,11 +171,11 @@ class DataCounters final : angle::NonCopyable
DataCounters();
~DataCounters();
int getAndIncrement(gl::EntryPoint entryPoint, const std::string &paramName);
int getAndIncrement(EntryPoint entryPoint, const std::string &paramName);
private:
// <CallName, ParamName>
using Counter = std::pair<gl::EntryPoint, std::string>;
using Counter = std::pair<EntryPoint, std::string>;
std::map<Counter, int> mData;
};
......
src/libANGLE/LoggingAnnotator.cpp
......@@ -19,16 +19,14 @@ bool LoggingAnnotator::getStatus()
}
void LoggingAnnotator::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
ANGLE_TRACE_EVENT_BEGIN0("gpu.angle", eventName);
}
void LoggingAnnotator::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
void LoggingAnnotator::endEvent(gl::Context *context, const char *eventName, EntryPoint entryPoint)
{
ANGLE_TRACE_EVENT_END0("gpu.angle", eventName);
}
......
src/libANGLE/LoggingAnnotator.h
......@@ -25,10 +25,10 @@ class LoggingAnnotator : public gl::DebugAnnotator
LoggingAnnotator() {}
~LoggingAnnotator() override {}
void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) override;
void endEvent(gl::Context *context, const char *eventName, gl::EntryPoint entryPoint) override;
void endEvent(gl::Context *context, const char *eventName, EntryPoint entryPoint) override;
void setMarker(const char *markerName) override;
bool getStatus() override;
void logMessage(const gl::LogMessage &msg) const override;
......
src/libANGLE/capture_gles_ext_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libANGLE/entry_points_utils.h
......@@ -15,48 +15,49 @@
#include "common/angleutils.h"
#include "common/entry_points_enum_autogen.h"
#include "common/mathutil.h"
#include "libANGLE/Context.h"
#include "libANGLE/Display.h"
namespace gl
{
// A template struct for determining the default value to return for each entry point.
template <EntryPoint EP, typename ReturnType>
template <angle::EntryPoint EP, typename ReturnType>
struct DefaultReturnValue;
// Default return values for each basic return type.
template <EntryPoint EP>
template <angle::EntryPoint EP>
struct DefaultReturnValue<EP, GLint>
{
static constexpr GLint kValue = -1;
};
// This doubles as the GLenum return value.
template <EntryPoint EP>
template <angle::EntryPoint EP>
struct DefaultReturnValue<EP, GLuint>
{
static constexpr GLuint kValue = 0;
};
template <EntryPoint EP>
template <angle::EntryPoint EP>
struct DefaultReturnValue<EP, GLboolean>
{
static constexpr GLboolean kValue = GL_FALSE;
};
template <EntryPoint EP>
template <angle::EntryPoint EP>
struct DefaultReturnValue<EP, ShaderProgramID>
{
static constexpr ShaderProgramID kValue = {0};
};
// Catch-all rules for pointer types.
template <EntryPoint EP, typename PointerType>
template <angle::EntryPoint EP, typename PointerType>
struct DefaultReturnValue<EP, const PointerType *>
{
static constexpr const PointerType *kValue = nullptr;
};
template <EntryPoint EP, typename PointerType>
template <angle::EntryPoint EP, typename PointerType>
struct DefaultReturnValue<EP, PointerType *>
{
static constexpr PointerType *kValue = nullptr;
......@@ -64,26 +65,26 @@ struct DefaultReturnValue<EP, PointerType *>
// Overloaded to return invalid index
template <>
struct DefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>
struct DefaultReturnValue<angle::EntryPoint::GLGetUniformBlockIndex, GLuint>
{
static constexpr GLuint kValue = GL_INVALID_INDEX;
};
// Specialized enum error value.
template <>
struct DefaultReturnValue<EntryPoint::ClientWaitSync, GLenum>
struct DefaultReturnValue<angle::EntryPoint::GLClientWaitSync, GLenum>
{
static constexpr GLenum kValue = GL_WAIT_FAILED;
};
// glTestFenceNV should still return TRUE for an invalid fence.
template <>
struct DefaultReturnValue<EntryPoint::TestFenceNV, GLboolean>
struct DefaultReturnValue<angle::EntryPoint::GLTestFenceNV, GLboolean>
{
static constexpr GLboolean kValue = GL_TRUE;
};
template <EntryPoint EP, typename ReturnType>
template <angle::EntryPoint EP, typename ReturnType>
constexpr ANGLE_INLINE ReturnType GetDefaultReturnValue()
{
return DefaultReturnValue<EP, ReturnType>::kValue;
......@@ -95,8 +96,7 @@ constexpr ANGLE_INLINE ReturnType GetDefaultReturnValue()
# define ANGLE_CAPTURE(...)
#endif // ANGLE_CAPTURE_ENABLED
#define FUNC_EVENT(format, ...) \
EVENT(nullptr, gl::EntryPoint::Begin, __FUNCTION__, format, __VA_ARGS__)
#define EGL_EVENT(EP, FMT, ...) EVENT(nullptr, EGL##EP, FMT, ##__VA_ARGS__)
inline int CID(const Context *context)
{
......
src/libANGLE/frame_capture_replay_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libANGLE/renderer/d3d/d3d11/Context11.cpp
......@@ -741,7 +741,8 @@ angle::Result Context11::insertEventMarker(GLsizei length, const char *marker)
angle::Result Context11::pushGroupMarker(GLsizei length, const char *marker)
{
mRenderer->getAnnotator()->beginEvent(nullptr, gl::EntryPoint::Begin, marker, marker);
mRenderer->getAnnotator()->beginEvent(nullptr, angle::EntryPoint::GLPushGroupMarkerEXT, marker,
marker);
mMarkerStack.push(std::string(marker));
return angle::Result::Continue;
}
......@@ -753,7 +754,8 @@ angle::Result Context11::popGroupMarker()
{
marker = mMarkerStack.top().c_str();
mMarkerStack.pop();
mRenderer->getAnnotator()->endEvent(nullptr, marker, gl::EntryPoint::Begin);
mRenderer->getAnnotator()->endEvent(nullptr, marker,
angle::EntryPoint::GLPopGroupMarkerEXT);
}
return angle::Result::Continue;
}
......
src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.cpp
......@@ -20,7 +20,7 @@ DebugAnnotator11::DebugAnnotator11() {}
DebugAnnotator11::~DebugAnnotator11() {}
void DebugAnnotator11::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
angle::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
......@@ -35,7 +35,7 @@ void DebugAnnotator11::beginEvent(gl::Context *context,
void DebugAnnotator11::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
angle::EntryPoint entryPoint)
{
angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
if (loggingEnabledForThisThread())
......
src/libANGLE/renderer/d3d/d3d11/DebugAnnotator11.h
......@@ -24,10 +24,12 @@ class DebugAnnotator11 : public angle::LoggingAnnotator
void initialize(ID3D11DeviceContext *context);
void release();
void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
angle::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) override;
void endEvent(gl::Context *context, const char *eventName, gl::EntryPoint entryPoint) override;
void endEvent(gl::Context *context,
const char *eventName,
angle::EntryPoint entryPoint) override;
void setMarker(const char *markerName) override;
bool getStatus() override;
......
src/libANGLE/renderer/d3d/d3d9/Context9.cpp
......@@ -376,7 +376,8 @@ angle::Result Context9::insertEventMarker(GLsizei length, const char *marker)
angle::Result Context9::pushGroupMarker(GLsizei length, const char *marker)
{
mRenderer->getAnnotator()->beginEvent(nullptr, gl::EntryPoint::Begin, marker, marker);
mRenderer->getAnnotator()->beginEvent(nullptr, angle::EntryPoint::GLPushGroupMarkerEXT, marker,
marker);
mMarkerStack.push(std::string(marker));
return angle::Result::Continue;
}
......@@ -388,7 +389,8 @@ angle::Result Context9::popGroupMarker()
{
marker = mMarkerStack.top().c_str();
mMarkerStack.pop();
mRenderer->getAnnotator()->endEvent(nullptr, marker, gl::EntryPoint::Begin);
mRenderer->getAnnotator()->endEvent(nullptr, marker,
angle::EntryPoint::GLPopGroupMarkerEXT);
}
return angle::Result::Continue;
}
......
src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.cpp
......@@ -14,7 +14,7 @@ namespace rx
{
void DebugAnnotator9::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
angle::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
......@@ -26,7 +26,7 @@ void DebugAnnotator9::beginEvent(gl::Context *context,
void DebugAnnotator9::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
angle::EntryPoint entryPoint)
{
angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
D3DPERF_EndEvent();
......
src/libANGLE/renderer/d3d/d3d9/DebugAnnotator9.h
......@@ -19,10 +19,12 @@ class DebugAnnotator9 : public angle::LoggingAnnotator
public:
DebugAnnotator9() {}
void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
angle::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) override;
void endEvent(gl::Context *context, const char *eventName, gl::EntryPoint entryPoint) override;
void endEvent(gl::Context *context,
const char *eventName,
angle::EntryPoint entryPoint) override;
void setMarker(const char *markerName) override;
bool getStatus() override;
......
src/libANGLE/renderer/vulkan/ContextVk.cpp
......@@ -2465,7 +2465,7 @@ void ContextVk::logEvent(const char *eventString)
mComputeDirtyBits.set(DIRTY_BIT_EVENT_LOG);
}
void ContextVk::endEventLog(gl::EntryPoint entryPoint)
void ContextVk::endEventLog(angle::EntryPoint entryPoint)
{
ASSERT(mRenderPassCommands);
mRenderPassCommands->getCommandBuffer().endDebugUtilsLabelEXT();
......
src/libANGLE/renderer/vulkan/ContextVk.h
......@@ -196,7 +196,7 @@ class ContextVk : public ContextImpl, public vk::Context, public MultisampleText
// Record GL API calls for debuggers
void logEvent(const char *eventString);
void endEventLog(gl::EntryPoint entryPoint);
void endEventLog(angle::EntryPoint entryPoint);
bool isViewportFlipEnabledForDrawFBO() const;
bool isViewportFlipEnabledForReadFBO() const;
......
src/libANGLE/renderer/vulkan/DebugAnnotatorVk.cpp
......@@ -20,7 +20,7 @@ DebugAnnotatorVk::DebugAnnotatorVk() {}
DebugAnnotatorVk::~DebugAnnotatorVk() {}
void DebugAnnotatorVk::beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
angle::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage)
{
......@@ -34,7 +34,7 @@ void DebugAnnotatorVk::beginEvent(gl::Context *context,
void DebugAnnotatorVk::endEvent(gl::Context *context,
const char *eventName,
gl::EntryPoint entryPoint)
angle::EntryPoint entryPoint)
{
angle::LoggingAnnotator::endEvent(context, eventName, entryPoint);
if (vkCmdBeginDebugUtilsLabelEXT && context && isDrawOrDispatchEntryPoint(entryPoint))
......@@ -49,53 +49,53 @@ bool DebugAnnotatorVk::getStatus()
return true;
}
bool DebugAnnotatorVk::isDrawOrDispatchEntryPoint(gl::EntryPoint entryPoint) const
bool DebugAnnotatorVk::isDrawOrDispatchEntryPoint(angle::EntryPoint entryPoint) const
{
switch (entryPoint)
{
case gl::EntryPoint::DispatchCompute:
case gl::EntryPoint::DispatchComputeIndirect:
case gl::EntryPoint::DrawArrays:
case gl::EntryPoint::DrawArraysIndirect:
case gl::EntryPoint::DrawArraysInstanced:
case gl::EntryPoint::DrawArraysInstancedANGLE:
case gl::EntryPoint::DrawArraysInstancedBaseInstance:
case gl::EntryPoint::DrawArraysInstancedBaseInstanceANGLE:
case gl::EntryPoint::DrawArraysInstancedEXT:
case gl::EntryPoint::DrawBuffer:
case gl::EntryPoint::DrawBuffers:
case gl::EntryPoint::DrawBuffersEXT:
case gl::EntryPoint::DrawElements:
case gl::EntryPoint::DrawElementsBaseVertex:
case gl::EntryPoint::DrawElementsBaseVertexEXT:
case gl::EntryPoint::DrawElementsBaseVertexOES:
case gl::EntryPoint::DrawElementsIndirect:
case gl::EntryPoint::DrawElementsInstanced:
case gl::EntryPoint::DrawElementsInstancedANGLE:
case gl::EntryPoint::DrawElementsInstancedBaseInstance:
case gl::EntryPoint::DrawElementsInstancedBaseVertex:
case gl::EntryPoint::DrawElementsInstancedBaseVertexBaseInstance:
case gl::EntryPoint::DrawElementsInstancedBaseVertexBaseInstanceANGLE:
case gl::EntryPoint::DrawElementsInstancedBaseVertexEXT:
case gl::EntryPoint::DrawElementsInstancedBaseVertexOES:
case gl::EntryPoint::DrawElementsInstancedEXT:
case gl::EntryPoint::DrawPixels:
case gl::EntryPoint::DrawRangeElements:
case gl::EntryPoint::DrawRangeElementsBaseVertex:
case gl::EntryPoint::DrawRangeElementsBaseVertexEXT:
case gl::EntryPoint::DrawRangeElementsBaseVertexOES:
case gl::EntryPoint::DrawTexfOES:
case gl::EntryPoint::DrawTexfvOES:
case gl::EntryPoint::DrawTexiOES:
case gl::EntryPoint::DrawTexivOES:
case gl::EntryPoint::DrawTexsOES:
case gl::EntryPoint::DrawTexsvOES:
case gl::EntryPoint::DrawTexxOES:
case gl::EntryPoint::DrawTexxvOES:
case gl::EntryPoint::DrawTransformFeedback:
case gl::EntryPoint::DrawTransformFeedbackInstanced:
case gl::EntryPoint::DrawTransformFeedbackStream:
case gl::EntryPoint::DrawTransformFeedbackStreamInstanced:
case angle::EntryPoint::GLDispatchCompute:
case angle::EntryPoint::GLDispatchComputeIndirect:
case angle::EntryPoint::GLDrawArrays:
case angle::EntryPoint::GLDrawArraysIndirect:
case angle::EntryPoint::GLDrawArraysInstanced:
case angle::EntryPoint::GLDrawArraysInstancedANGLE:
case angle::EntryPoint::GLDrawArraysInstancedBaseInstance:
case angle::EntryPoint::GLDrawArraysInstancedBaseInstanceANGLE:
case angle::EntryPoint::GLDrawArraysInstancedEXT:
case angle::EntryPoint::GLDrawBuffer:
case angle::EntryPoint::GLDrawBuffers:
case angle::EntryPoint::GLDrawBuffersEXT:
case angle::EntryPoint::GLDrawElements:
case angle::EntryPoint::GLDrawElementsBaseVertex:
case angle::EntryPoint::GLDrawElementsBaseVertexEXT:
case angle::EntryPoint::GLDrawElementsBaseVertexOES:
case angle::EntryPoint::GLDrawElementsIndirect:
case angle::EntryPoint::GLDrawElementsInstanced:
case angle::EntryPoint::GLDrawElementsInstancedANGLE:
case angle::EntryPoint::GLDrawElementsInstancedBaseInstance:
case angle::EntryPoint::GLDrawElementsInstancedBaseVertex:
case angle::EntryPoint::GLDrawElementsInstancedBaseVertexBaseInstance:
case angle::EntryPoint::GLDrawElementsInstancedBaseVertexBaseInstanceANGLE:
case angle::EntryPoint::GLDrawElementsInstancedBaseVertexEXT:
case angle::EntryPoint::GLDrawElementsInstancedBaseVertexOES:
case angle::EntryPoint::GLDrawElementsInstancedEXT:
case angle::EntryPoint::GLDrawPixels:
case angle::EntryPoint::GLDrawRangeElements:
case angle::EntryPoint::GLDrawRangeElementsBaseVertex:
case angle::EntryPoint::GLDrawRangeElementsBaseVertexEXT:
case angle::EntryPoint::GLDrawRangeElementsBaseVertexOES:
case angle::EntryPoint::GLDrawTexfOES:
case angle::EntryPoint::GLDrawTexfvOES:
case angle::EntryPoint::GLDrawTexiOES:
case angle::EntryPoint::GLDrawTexivOES:
case angle::EntryPoint::GLDrawTexsOES:
case angle::EntryPoint::GLDrawTexsvOES:
case angle::EntryPoint::GLDrawTexxOES:
case angle::EntryPoint::GLDrawTexxvOES:
case angle::EntryPoint::GLDrawTransformFeedback:
case angle::EntryPoint::GLDrawTransformFeedbackInstanced:
case angle::EntryPoint::GLDrawTransformFeedbackStream:
case angle::EntryPoint::GLDrawTransformFeedbackStreamInstanced:
return true;
default:
return false;
......
src/libANGLE/renderer/vulkan/DebugAnnotatorVk.h
......@@ -20,14 +20,16 @@ class DebugAnnotatorVk : public angle::LoggingAnnotator
DebugAnnotatorVk();
~DebugAnnotatorVk() override;
void beginEvent(gl::Context *context,
gl::EntryPoint entryPoint,
angle::EntryPoint entryPoint,
const char *eventName,
const char *eventMessage) override;
void endEvent(gl::Context *context, const char *eventName, gl::EntryPoint entryPoint) override;
void endEvent(gl::Context *context,
const char *eventName,
angle::EntryPoint entryPoint) override;
bool getStatus() override;
private:
bool isDrawOrDispatchEntryPoint(gl::EntryPoint entryPoint) const;
bool isDrawOrDispatchEntryPoint(angle::EntryPoint entryPoint) const;
// Note: To avoid any race conditions between threads, this class has no private data; all
// events are stored in ContextVk.
......
src/libGL/entry_points_gl_1_0_autogen.cpp
This source diff could not be displayed because it is too large. You can view the blob instead.
src/libGL/entry_points_gl_1_2_autogen.cpp
......@@ -38,7 +38,7 @@ void GL_APIENTRY CopyTexSubImage3D(GLenum target,
GLsizei height)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::CopyTexSubImage3D, "glCopyTexSubImage3D",
EVENT(context, GLCopyTexSubImage3D,
"context = %d, target = %s, level = %d, xoffset = %d, yoffset = %d, zoffset = %d, x = "
"%d, y = %d, width = %d, height = %d",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target), level, xoffset, yoffset,
......@@ -73,7 +73,7 @@ void GL_APIENTRY DrawRangeElements(GLenum mode,
const void *indices)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawRangeElements, "glDrawRangeElements",
EVENT(context, GLDrawRangeElements,
"context = %d, mode = %s, start = %u, end = %u, count = %d, type = %s, indices = "
"0x%016" PRIxPTR "",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), start, end, count,
......@@ -112,7 +112,7 @@ void GL_APIENTRY TexImage3D(GLenum target,
const void *pixels)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::TexImage3D, "glTexImage3D",
EVENT(context, GLTexImage3D,
"context = %d, target = %s, level = %d, internalformat = %d, width = %d, height = %d, "
"depth = %d, border = %d, format = %s, type = %s, pixels = 0x%016" PRIxPTR "",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target), level, internalformat,
......@@ -153,7 +153,7 @@ void GL_APIENTRY TexSubImage3D(GLenum target,
const void *pixels)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::TexSubImage3D, "glTexSubImage3D",
EVENT(context, GLTexSubImage3D,
"context = %d, target = %s, level = %d, xoffset = %d, yoffset = %d, zoffset = %d, width "
"= %d, height = %d, depth = %d, format = %s, type = %s, pixels = 0x%016" PRIxPTR "",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target), level, xoffset, yoffset,
......
src/libGL/entry_points_gl_2_1_autogen.cpp
......@@ -33,7 +33,7 @@ void GL_APIENTRY UniformMatrix2x3fv(GLint location,
const GLfloat *value)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::UniformMatrix2x3fv, "glUniformMatrix2x3fv",
EVENT(context, GLUniformMatrix2x3fv,
"context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
......@@ -63,7 +63,7 @@ void GL_APIENTRY UniformMatrix2x4fv(GLint location,
const GLfloat *value)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::UniformMatrix2x4fv, "glUniformMatrix2x4fv",
EVENT(context, GLUniformMatrix2x4fv,
"context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
......@@ -93,7 +93,7 @@ void GL_APIENTRY UniformMatrix3x2fv(GLint location,
const GLfloat *value)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::UniformMatrix3x2fv, "glUniformMatrix3x2fv",
EVENT(context, GLUniformMatrix3x2fv,
"context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
......@@ -123,7 +123,7 @@ void GL_APIENTRY UniformMatrix3x4fv(GLint location,
const GLfloat *value)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::UniformMatrix3x4fv, "glUniformMatrix3x4fv",
EVENT(context, GLUniformMatrix3x4fv,
"context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
......@@ -153,7 +153,7 @@ void GL_APIENTRY UniformMatrix4x2fv(GLint location,
const GLfloat *value)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::UniformMatrix4x2fv, "glUniformMatrix4x2fv",
EVENT(context, GLUniformMatrix4x2fv,
"context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
......@@ -183,7 +183,7 @@ void GL_APIENTRY UniformMatrix4x3fv(GLint location,
const GLfloat *value)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::UniformMatrix4x3fv, "glUniformMatrix4x3fv",
EVENT(context, GLUniformMatrix4x3fv,
"context = %d, location = %d, count = %d, transpose = %s, value = 0x%016" PRIxPTR "",
CID(context), location, count, GLbooleanToString(transpose), (uintptr_t)value);
......
src/libGL/entry_points_gl_3_1_autogen.cpp
......@@ -34,7 +34,7 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
GLsizeiptr size)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::CopyBufferSubData, "glCopyBufferSubData",
EVENT(context, GLCopyBufferSubData,
"context = %d, readTarget = %s, writeTarget = %s, readOffset = %llu, writeOffset = %llu, "
"size = %llu",
CID(context), GLenumToString(GLenumGroup::CopyBufferSubDataTarget, readTarget),
......@@ -67,7 +67,7 @@ void GL_APIENTRY CopyBufferSubData(GLenum readTarget,
void GL_APIENTRY DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instancecount)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawArraysInstanced, "glDrawArraysInstanced",
EVENT(context, GLDrawArraysInstanced,
"context = %d, mode = %s, first = %d, count = %d, instancecount = %d", CID(context),
GLenumToString(GLenumGroup::PrimitiveType, mode), first, count, instancecount);
......@@ -98,7 +98,7 @@ void GL_APIENTRY DrawElementsInstanced(GLenum mode,
GLsizei instancecount)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawElementsInstanced, "glDrawElementsInstanced",
EVENT(context, GLDrawElementsInstanced,
"context = %d, mode = %s, count = %d, type = %s, indices = 0x%016" PRIxPTR
", instancecount = %d",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
......@@ -133,7 +133,7 @@ void GL_APIENTRY GetActiveUniformBlockName(GLuint program,
{
Context *context = GetValidGlobalContext();
EVENT(
context, gl::EntryPoint::GetActiveUniformBlockName, "glGetActiveUniformBlockName",
context, GLGetActiveUniformBlockName,
"context = %d, program = %u, uniformBlockIndex = %u, bufSize = %d, length = 0x%016" PRIxPTR
", uniformBlockName = 0x%016" PRIxPTR "",
CID(context), program, uniformBlockIndex, bufSize, (uintptr_t)length,
......@@ -167,7 +167,7 @@ void GL_APIENTRY GetActiveUniformBlockiv(GLuint program,
GLint *params)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::GetActiveUniformBlockiv, "glGetActiveUniformBlockiv",
EVENT(context, GLGetActiveUniformBlockiv,
"context = %d, program = %u, uniformBlockIndex = %u, pname = %s, params = 0x%016" PRIxPTR
"",
CID(context), program, uniformBlockIndex,
......@@ -200,7 +200,7 @@ void GL_APIENTRY GetActiveUniformName(GLuint program,
GLchar *uniformName)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::GetActiveUniformName, "glGetActiveUniformName",
EVENT(context, GLGetActiveUniformName,
"context = %d, program = %u, uniformIndex = %u, bufSize = %d, length = 0x%016" PRIxPTR
", uniformName = 0x%016" PRIxPTR "",
CID(context), program, uniformIndex, bufSize, (uintptr_t)length, (uintptr_t)uniformName);
......@@ -233,7 +233,7 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
GLint *params)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::GetActiveUniformsiv, "glGetActiveUniformsiv",
EVENT(context, GLGetActiveUniformsiv,
"context = %d, program = %u, uniformCount = %d, uniformIndices = 0x%016" PRIxPTR
", pname = %s, params = 0x%016" PRIxPTR "",
CID(context), program, uniformCount, (uintptr_t)uniformIndices,
......@@ -263,7 +263,7 @@ void GL_APIENTRY GetActiveUniformsiv(GLuint program,
GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::GetUniformBlockIndex, "glGetUniformBlockIndex",
EVENT(context, GLGetUniformBlockIndex,
"context = %d, program = %u, uniformBlockName = 0x%016" PRIxPTR "", CID(context), program,
(uintptr_t)uniformBlockName);
......@@ -280,7 +280,8 @@ GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlo
}
else
{
returnValue = GetDefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>();
returnValue =
GetDefaultReturnValue<angle::EntryPoint::GLGetUniformBlockIndex, GLuint>();
}
ANGLE_CAPTURE(GetUniformBlockIndex, isCallValid, context, programPacked, uniformBlockName,
returnValue);
......@@ -288,7 +289,7 @@ GLuint GL_APIENTRY GetUniformBlockIndex(GLuint program, const GLchar *uniformBlo
else
{
GenerateContextLostErrorOnCurrentGlobalContext();
returnValue = GetDefaultReturnValue<EntryPoint::GetUniformBlockIndex, GLuint>();
returnValue = GetDefaultReturnValue<angle::EntryPoint::GLGetUniformBlockIndex, GLuint>();
}
return returnValue;
}
......@@ -299,7 +300,7 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
GLuint *uniformIndices)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::GetUniformIndices, "glGetUniformIndices",
EVENT(context, GLGetUniformIndices,
"context = %d, program = %u, uniformCount = %d, uniformNames = 0x%016" PRIxPTR
", uniformIndices = 0x%016" PRIxPTR "",
CID(context), program, uniformCount, (uintptr_t)uniformNames, (uintptr_t)uniformIndices);
......@@ -327,8 +328,7 @@ void GL_APIENTRY GetUniformIndices(GLuint program,
void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::PrimitiveRestartIndex, "glPrimitiveRestartIndex",
"context = %d, index = %u", CID(context), index);
EVENT(context, GLPrimitiveRestartIndex, "context = %d, index = %u", CID(context), index);
if (context)
{
......@@ -350,9 +350,8 @@ void GL_APIENTRY PrimitiveRestartIndex(GLuint index)
void GL_APIENTRY TexBuffer(GLenum target, GLenum internalformat, GLuint buffer)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::TexBuffer, "glTexBuffer",
"context = %d, target = %s, internalformat = %s, buffer = %u", CID(context),
GLenumToString(GLenumGroup::TextureTarget, target),
EVENT(context, GLTexBuffer, "context = %d, target = %s, internalformat = %s, buffer = %u",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target),
GLenumToString(GLenumGroup::InternalFormat, internalformat), buffer);
if (context)
......@@ -379,7 +378,7 @@ void GL_APIENTRY UniformBlockBinding(GLuint program,
GLuint uniformBlockBinding)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::UniformBlockBinding, "glUniformBlockBinding",
EVENT(context, GLUniformBlockBinding,
"context = %d, program = %u, uniformBlockIndex = %u, uniformBlockBinding = %u",
CID(context), program, uniformBlockIndex, uniformBlockBinding);
......
src/libGL/entry_points_gl_4_2_autogen.cpp
......@@ -36,7 +36,7 @@ void GL_APIENTRY BindImageTexture(GLuint unit,
GLenum format)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BindImageTexture, "glBindImageTexture",
EVENT(context, GLBindImageTexture,
"context = %d, unit = %u, texture = %u, level = %d, layered = %s, layer = %d, access = "
"%s, format = %s",
CID(context), unit, texture, level, GLbooleanToString(layered), layer,
......@@ -70,8 +70,7 @@ void GL_APIENTRY DrawArraysInstancedBaseInstance(GLenum mode,
GLuint baseinstance)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawArraysInstancedBaseInstance,
"glDrawArraysInstancedBaseInstance",
EVENT(context, GLDrawArraysInstancedBaseInstance,
"context = %d, mode = %s, first = %d, count = %d, instancecount = %d, baseinstance = %u",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), first, count,
instancecount, baseinstance);
......@@ -105,8 +104,7 @@ void GL_APIENTRY DrawElementsInstancedBaseInstance(GLenum mode,
GLuint baseinstance)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawElementsInstancedBaseInstance,
"glDrawElementsInstancedBaseInstance",
EVENT(context, GLDrawElementsInstancedBaseInstance,
"context = %d, mode = %s, count = %d, type = %s, indices = 0x%016" PRIxPTR
", instancecount = %d, baseinstance = %u",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
......@@ -142,8 +140,7 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
GLuint baseinstance)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawElementsInstancedBaseVertexBaseInstance,
"glDrawElementsInstancedBaseVertexBaseInstance",
EVENT(context, GLDrawElementsInstancedBaseVertexBaseInstance,
"context = %d, mode = %s, count = %d, type = %s, indices = 0x%016" PRIxPTR
", instancecount = %d, basevertex = %d, baseinstance = %u",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), count,
......@@ -176,8 +173,7 @@ void GL_APIENTRY DrawElementsInstancedBaseVertexBaseInstance(GLenum mode,
void GL_APIENTRY DrawTransformFeedbackInstanced(GLenum mode, GLuint id, GLsizei instancecount)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawTransformFeedbackInstanced,
"glDrawTransformFeedbackInstanced",
EVENT(context, GLDrawTransformFeedbackInstanced,
"context = %d, mode = %s, id = %u, instancecount = %d", CID(context),
GLenumToString(GLenumGroup::PrimitiveType, mode), id, instancecount);
......@@ -207,8 +203,7 @@ void GL_APIENTRY DrawTransformFeedbackStreamInstanced(GLenum mode,
GLsizei instancecount)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::DrawTransformFeedbackStreamInstanced,
"glDrawTransformFeedbackStreamInstanced",
EVENT(context, GLDrawTransformFeedbackStreamInstanced,
"context = %d, mode = %s, id = %u, stream = %u, instancecount = %d", CID(context),
GLenumToString(GLenumGroup::PrimitiveType, mode), id, stream, instancecount);
......@@ -238,8 +233,7 @@ void GL_APIENTRY GetActiveAtomicCounterBufferiv(GLuint program,
GLint *params)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::GetActiveAtomicCounterBufferiv,
"glGetActiveAtomicCounterBufferiv",
EVENT(context, GLGetActiveAtomicCounterBufferiv,
"context = %d, program = %u, bufferIndex = %u, pname = %s, params = 0x%016" PRIxPTR "",
CID(context), program, bufferIndex,
GLenumToString(GLenumGroup::AtomicCounterBufferPName, pname), (uintptr_t)params);
......@@ -271,7 +265,7 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
GLint *params)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::GetInternalformativ, "glGetInternalformativ",
EVENT(context, GLGetInternalformativ,
"context = %d, target = %s, internalformat = %s, pname = %s, bufSize = %d, params = "
"0x%016" PRIxPTR "",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target),
......@@ -300,8 +294,8 @@ void GL_APIENTRY GetInternalformativ(GLenum target,
void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::MemoryBarrier, "glMemoryBarrier", "context = %d, barriers = %s",
CID(context), GLbitfieldToString(GLenumGroup::MemoryBarrierMask, barriers).c_str());
EVENT(context, GLMemoryBarrier, "context = %d, barriers = %s", CID(context),
GLbitfieldToString(GLenumGroup::MemoryBarrierMask, barriers).c_str());
if (context)
{
......@@ -322,7 +316,7 @@ void GL_APIENTRY MemoryBarrier(GLbitfield barriers)
void GL_APIENTRY TexStorage1D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::TexStorage1D, "glTexStorage1D",
EVENT(context, GLTexStorage1D,
"context = %d, target = %s, levels = %d, internalformat = %s, width = %d", CID(context),
GLenumToString(GLenumGroup::TextureTarget, target), levels,
GLenumToString(GLenumGroup::InternalFormat, internalformat), width);
......@@ -348,7 +342,7 @@ void GL_APIENTRY
TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::TexStorage2D, "glTexStorage2D",
EVENT(context, GLTexStorage2D,
"context = %d, target = %s, levels = %d, internalformat = %s, width = %d, height = %d",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,
GLenumToString(GLenumGroup::InternalFormat, internalformat), width, height);
......@@ -381,7 +375,7 @@ void GL_APIENTRY TexStorage3D(GLenum target,
GLsizei depth)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::TexStorage3D, "glTexStorage3D",
EVENT(context, GLTexStorage3D,
"context = %d, target = %s, levels = %d, internalformat = %s, width = %d, height = %d, "
"depth = %d",
CID(context), GLenumToString(GLenumGroup::TextureTarget, target), levels,
......
src/libGL/entry_points_gl_4_4_autogen.cpp
......@@ -30,7 +30,7 @@ namespace gl
void GL_APIENTRY BindBuffersBase(GLenum target, GLuint first, GLsizei count, const GLuint *buffers)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BindBuffersBase, "glBindBuffersBase",
EVENT(context, GLBindBuffersBase,
"context = %d, target = %s, first = %u, count = %d, buffers = 0x%016" PRIxPTR "",
CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target), first, count,
(uintptr_t)buffers);
......@@ -61,7 +61,7 @@ void GL_APIENTRY BindBuffersRange(GLenum target,
const GLsizeiptr *sizes)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BindBuffersRange, "glBindBuffersRange",
EVENT(context, GLBindBuffersRange,
"context = %d, target = %s, first = %u, count = %d, buffers = 0x%016" PRIxPTR
", offsets = 0x%016" PRIxPTR ", sizes = 0x%016" PRIxPTR "",
CID(context), GLenumToString(GLenumGroup::BufferTargetARB, target), first, count,
......@@ -90,7 +90,7 @@ void GL_APIENTRY BindBuffersRange(GLenum target,
void GL_APIENTRY BindImageTextures(GLuint first, GLsizei count, const GLuint *textures)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BindImageTextures, "glBindImageTextures",
EVENT(context, GLBindImageTextures,
"context = %d, first = %u, count = %d, textures = 0x%016" PRIxPTR "", CID(context), first,
count, (uintptr_t)textures);
......@@ -114,7 +114,7 @@ void GL_APIENTRY BindImageTextures(GLuint first, GLsizei count, const GLuint *te
void GL_APIENTRY BindSamplers(GLuint first, GLsizei count, const GLuint *samplers)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BindSamplers, "glBindSamplers",
EVENT(context, GLBindSamplers,
"context = %d, first = %u, count = %d, samplers = 0x%016" PRIxPTR "", CID(context), first,
count, (uintptr_t)samplers);
......@@ -138,7 +138,7 @@ void GL_APIENTRY BindSamplers(GLuint first, GLsizei count, const GLuint *sampler
void GL_APIENTRY BindTextures(GLuint first, GLsizei count, const GLuint *textures)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BindTextures, "glBindTextures",
EVENT(context, GLBindTextures,
"context = %d, first = %u, count = %d, textures = 0x%016" PRIxPTR "", CID(context), first,
count, (uintptr_t)textures);
......@@ -166,7 +166,7 @@ void GL_APIENTRY BindVertexBuffers(GLuint first,
const GLsizei *strides)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BindVertexBuffers, "glBindVertexBuffers",
EVENT(context, GLBindVertexBuffers,
"context = %d, first = %u, count = %d, buffers = 0x%016" PRIxPTR
", offsets = 0x%016" PRIxPTR ", strides = 0x%016" PRIxPTR "",
CID(context), first, count, (uintptr_t)buffers, (uintptr_t)offsets, (uintptr_t)strides);
......@@ -194,7 +194,7 @@ void GL_APIENTRY BindVertexBuffers(GLuint first,
void GL_APIENTRY BufferStorage(GLenum target, GLsizeiptr size, const void *data, GLbitfield flags)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::BufferStorage, "glBufferStorage",
EVENT(context, GLBufferStorage,
"context = %d, target = %s, size = %llu, data = 0x%016" PRIxPTR ", flags = %s",
CID(context), GLenumToString(GLenumGroup::BufferStorageTarget, target),
static_cast<unsigned long long>(size), (uintptr_t)data,
......@@ -222,7 +222,7 @@ void GL_APIENTRY
ClearTexImage(GLuint texture, GLint level, GLenum format, GLenum type, const void *data)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::ClearTexImage, "glClearTexImage",
EVENT(context, GLClearTexImage,
"context = %d, texture = %u, level = %d, format = %s, type = %s, data = 0x%016" PRIxPTR
"",
CID(context), texture, level, GLenumToString(GLenumGroup::PixelFormat, format),
......@@ -261,7 +261,7 @@ void GL_APIENTRY ClearTexSubImage(GLuint texture,
const void *data)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::ClearTexSubImage, "glClearTexSubImage",
EVENT(context, GLClearTexSubImage,
"context = %d, texture = %u, level = %d, xoffset = %d, yoffset = %d, zoffset = %d, width "
"= %d, height = %d, depth = %d, format = %s, type = %s, data = 0x%016" PRIxPTR "",
CID(context), texture, level, xoffset, yoffset, zoffset, width, height, depth,
......
src/libGL/entry_points_gl_4_6_autogen.cpp
......@@ -34,7 +34,7 @@ void GL_APIENTRY MultiDrawArraysIndirectCount(GLenum mode,
GLsizei stride)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::MultiDrawArraysIndirectCount, "glMultiDrawArraysIndirectCount",
EVENT(context, GLMultiDrawArraysIndirectCount,
"context = %d, mode = %s, indirect = 0x%016" PRIxPTR
", drawcount = %llu, maxdrawcount = %d, stride = %d",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode), (uintptr_t)indirect,
......@@ -67,8 +67,7 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
GLsizei stride)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::MultiDrawElementsIndirectCount,
"glMultiDrawElementsIndirectCount",
EVENT(context, GLMultiDrawElementsIndirectCount,
"context = %d, mode = %s, type = %s, indirect = 0x%016" PRIxPTR
", drawcount = %llu, maxdrawcount = %d, stride = %d",
CID(context), GLenumToString(GLenumGroup::PrimitiveType, mode),
......@@ -98,8 +97,8 @@ void GL_APIENTRY MultiDrawElementsIndirectCount(GLenum mode,
void GL_APIENTRY PolygonOffsetClamp(GLfloat factor, GLfloat units, GLfloat clamp)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::PolygonOffsetClamp, "glPolygonOffsetClamp",
"context = %d, factor = %f, units = %f, clamp = %f", CID(context), factor, units, clamp);
EVENT(context, GLPolygonOffsetClamp, "context = %d, factor = %f, units = %f, clamp = %f",
CID(context), factor, units, clamp);
if (context)
{
......@@ -125,7 +124,7 @@ void GL_APIENTRY SpecializeShader(GLuint shader,
const GLuint *pConstantValue)
{
Context *context = GetValidGlobalContext();
EVENT(context, gl::EntryPoint::SpecializeShader, "glSpecializeShader",
EVENT(context, GLSpecializeShader,
"context = %d, shader = %u, pEntryPoint = 0x%016" PRIxPTR
", numSpecializationConstants = %u, pConstantIndex = 0x%016" PRIxPTR
", pConstantValue = 0x%016" PRIxPTR "",
......
src/libGL/entry_points_wgl.cpp
......@@ -52,6 +52,8 @@ void ClipConfigs(const std::vector<const Config *> &filteredConfigs,
}
} // anonymous namespace
#define WGL_EVENT(EP, FMT, ...) EVENT(nullptr, WGL##EP, FMT, __VA_ARGS__)
extern "C" {
// WGL 1.0
......@@ -222,7 +224,7 @@ wglGetLayerPaletteEntries(HDC hdc, int iLayerPlane, int iStart, int cEntries, CO
PROC GL_APIENTRY wglGetProcAddress(LPCSTR lpszProc)
{
ANGLE_SCOPED_GLOBAL_LOCK();
FUNC_EVENT("const char *procname = \"%s\"", lpszProc);
WGL_EVENT(GetProcAddress, "const char *procname = \"%s\"", lpszProc);
egl::Thread *thread = egl::GetCurrentThread();
const ProcEntry *entry =
......
src/libGLESv2.gni
......@@ -41,6 +41,8 @@ libangle_common_sources = [
"src/common/platform.h",
"src/common/string_utils.cpp",
"src/common/string_utils.h",
"src/common/system_utils.cpp",
"src/common/system_utils.h",
"src/common/third_party/base/anglebase/base_export.h",
"src/common/third_party/base/anglebase/containers/mru_cache.h",
"src/common/third_party/base/anglebase/logging.h",
......@@ -68,24 +70,15 @@ xxhash_sources = [
"src/common/third_party/xxhash/xxhash.h",
]
angle_system_utils_sources = [
"src/common/Optional.h",
"src/common/angleutils.h",
"src/common/debug.h",
"src/common/platform.h",
"src/common/system_utils.cpp",
"src/common/system_utils.h",
]
if (is_linux || is_chromeos || is_android || is_fuchsia) {
angle_system_utils_sources += [
libangle_common_sources += [
"src/common/system_utils_linux.cpp",
"src/common/system_utils_posix.cpp",
]
}
if (is_mac) {
angle_system_utils_sources += [
libangle_common_sources += [
"src/common/apple/SoftLinking.h",
"src/common/gl/cgl/FunctionsCGL.cpp",
"src/common/gl/cgl/FunctionsCGL.h",
......@@ -95,11 +88,11 @@ if (is_mac) {
}
if (is_win) {
angle_system_utils_sources += [ "src/common/system_utils_win.cpp" ]
libangle_common_sources += [ "src/common/system_utils_win.cpp" ]
if (current_os == "winuwp") {
angle_system_utils_sources += [ "src/common/system_utils_winuwp.cpp" ]
libangle_common_sources += [ "src/common/system_utils_winuwp.cpp" ]
} else {
angle_system_utils_sources += [ "src/common/system_utils_win32.cpp" ]
libangle_common_sources += [ "src/common/system_utils_win32.cpp" ]
}
}
......
src/libGLESv2/entry_points_gles_ext_autogen.cpp
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