Skip to content

Commit

Permalink
Clean up glimp references (#4130)
Browse files Browse the repository at this point in the history
b/362374622
  • Loading branch information
madhurajayaraman committed Sep 20, 2024
1 parent 5c1969f commit 453e520
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 34 deletions.
27 changes: 0 additions & 27 deletions cobalt/renderer/backend/egl/graphics_system.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,11 @@
#include <utility>

#include "base/debug/leak_annotations.h"
#if defined(ENABLE_GLIMP_TRACING)
#include "base/trace_event/trace_event.h"
#endif

#include "cobalt/configuration/configuration.h"
#include "cobalt/renderer/backend/egl/display.h"
#include "cobalt/renderer/backend/egl/graphics_context.h"
#include "cobalt/renderer/backend/egl/texture.h"
#include "cobalt/renderer/backend/egl/utils.h"
#if defined(ENABLE_GLIMP_TRACING)
#include "internal/starboard/shared/glimp/tracing/tracing.h"
#endif

#include "cobalt/renderer/egl_and_gles.h"

#if defined(GLES3_SUPPORTED)
Expand All @@ -45,19 +37,6 @@ namespace cobalt {
namespace renderer {
namespace backend {

#if defined(ENABLE_GLIMP_TRACING)
// Hookup glimp tracing to Chromium's base trace_event tracing.
class GlimpToBaseTraceEventBridge : public glimp::TraceEventImpl {
public:
void BeginTrace(const char* name) override {
TRACE_EVENT_BEGIN0("glimp", name);
}
void EndTrace(const char* name) override { TRACE_EVENT_END0("glimp", name); }
};

GlimpToBaseTraceEventBridge s_glimp_to_base_trace_event_bridge;
#endif // #if defined(ENABLE_GLIMP_TRACING)

namespace {

struct ChooseConfigResult {
Expand Down Expand Up @@ -133,12 +112,6 @@ base::Optional<ChooseConfigResult> ChooseConfig(

GraphicsSystemEGL::GraphicsSystemEGL(
system_window::SystemWindow* system_window) {
#if defined(ENABLE_GLIMP_TRACING)
// If glimp tracing is enabled, hook up glimp trace calls to Chromium's
// base trace_event calls.
glimp::SetTraceEventImplementation(&s_glimp_to_base_trace_event_bridge);
#endif // #if defined(ENABLE_GLIMP_TRACING)

display_ = EGL_CALL_SIMPLE(eglGetDisplay(EGL_DEFAULT_DISPLAY));
CHECK_NE(EGL_NO_DISPLAY, display_);
CHECK_EQ(EGL_SUCCESS, EGL_CALL_SIMPLE(eglGetError()));
Expand Down
7 changes: 0 additions & 7 deletions starboard/egl_and_gles/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ config("egl_and_gles_glimp_public_config") {
defines = [ "GL_GLEXT_PROTOTYPES" ]
}

if (gl_type == "glimp") {
group("egl_and_gles_glimp") {
public_configs = [ ":egl_and_gles_glimp_public_config" ]
public_deps = [ "//internal/starboard/shared/glimp" ]
}
}

declare_args() {
enable_d3d11_feature_level_11 = false
}
Expand Down

0 comments on commit 453e520

Please sign in to comment.