Remove emugl crash report from Gfxstream interface
... as this is never used internally in Gfxstream.
Bug: b/403363880
Test: m
Change-Id: If25399e9321fd305b0ebf42e1388696463872612
diff --git a/host/RenderLibImpl.cpp b/host/RenderLibImpl.cpp
index 2b40df9..8054cd9 100644
--- a/host/RenderLibImpl.cpp
+++ b/host/RenderLibImpl.cpp
@@ -77,10 +77,6 @@
#endif
}
-void RenderLibImpl::setCrashReporter(emugl_crash_reporter_t reporter) {
- // set_emugl_crash_reporter(reporter);
-}
-
void RenderLibImpl::setFeatureController(emugl_feature_is_enabled_t featureController) {
android::featurecontrol::setFeatureEnabledCallback(featureController);
}
diff --git a/host/RenderLibImpl.h b/host/RenderLibImpl.h
index a9b4534..8ca6a46 100644
--- a/host/RenderLibImpl.h
+++ b/host/RenderLibImpl.h
@@ -32,7 +32,6 @@
virtual void getGlesVersion(int* maj, int* min) override;
virtual void setLogger(emugl_logger_struct logger) override;
- virtual void setCrashReporter(emugl_crash_reporter_t reporter) override;
virtual void setFeatureController(emugl_feature_is_enabled_t featureController) override;
virtual void setSyncDevice(emugl_sync_create_timeline_t,
emugl_sync_create_fence_t,
diff --git a/host/gl/glestranslator/GLES_V2/GLESv2Context.cpp b/host/gl/glestranslator/GLES_V2/GLESv2Context.cpp
index efababc..1c79542 100644
--- a/host/gl/glestranslator/GLES_V2/GLESv2Context.cpp
+++ b/host/gl/glestranslator/GLES_V2/GLESv2Context.cpp
@@ -22,8 +22,7 @@
#include "TransformFeedbackData.h"
#include "aemu/base/synchronization/Lock.h"
#include "aemu/base/files/StreamSerializing.h"
-
-#include "host-common/crash_reporter.h"
+#include "gfxstream/host/logging.h"
#include <string.h>
@@ -609,8 +608,8 @@
s_glDispatch.glDrawArraysInstanced(mode, first, count, primcount);
break;
default:
- emugl::emugl_crash_reporter(
- "drawWithEmulations has corrupt call parameters!");
+ GFXSTREAM_FATAL("drawWithEmulations has corrupt call parameters!");
+ break;
}
if (needClientIBOSetup) {
diff --git a/host/gl/glestranslator/GLcommon/ObjectNameSpace.cpp b/host/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
index 8e9ba52..ca46f12 100644
--- a/host/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
+++ b/host/gl/glestranslator/GLcommon/ObjectNameSpace.cpp
@@ -25,7 +25,6 @@
#include "aemu/base/files/StreamSerializing.h"
#include "aemu/base/synchronization/Lock.h"
#include "gfxstream/host/logging.h"
-#include "host-common/crash_reporter.h"
#include "snapshot/TextureLoader.h"
#include "snapshot/TextureSaver.h"
@@ -76,8 +75,7 @@
GFXSTREAM_DEBUG("%p: try to load object %llu", this, objData.first);
if (!objData.second) {
// bug: 130631787
- // emugl::emugl_crash_reporter(
- // "Fatal: null object data ptr on restore\n");
+ // GFXSTREAM_FATAL("Fatal: null object data ptr on restore\n");
continue;
}
objData.second->postLoad(getObjDataPtr);
@@ -101,9 +99,7 @@
NamedObjectPtr texNamedObj = saveableTexture->getGlobalObject();
if (!texNamedObj) {
GFXSTREAM_DEBUG("%p: fatal: global object null for texture data %p", this, texData);
- emugl::emugl_crash_reporter(
- "fatal: null global texture object in "
- "NameSpace::touchTextures");
+ GFXSTREAM_FATAL("Null global texture object in NameSpace::touchTextures");
}
setGlobalObject(obj.first, texNamedObj);
texData->setGlobalName(texNamedObj->getGlobalName());
@@ -299,8 +295,7 @@
void GlobalNameSpace::preSaveAddEglImage(EglImage* eglImage) {
if (!eglImage->globalTexObj) {
GFXSTREAM_DEBUG("%p: egl image %p with null texture object", this, eglImage);
- emugl::emugl_crash_reporter(
- "Fatal: egl image with null texture object\n");
+ GFXSTREAM_FATAL("Fatal: egl image with null texture object\n");
}
unsigned int globalName = eglImage->globalTexObj->getGlobalName();
android::base::AutoLock lock(m_lock);
@@ -384,10 +379,7 @@
const ITextureLoaderPtr textureLoader = textureLoaderWPtr.lock();
assert(m_textureMap.size() == 0);
if (!textureLoader->start()) {
- fprintf(stderr,
- "Error: texture file unsupported version or corrupted.\n");
- emugl::emugl_crash_reporter(
- "Error: texture file unsupported version or corrupted.\n");
+ GFXSTREAM_FATAL("Texture file unsupported version or corrupted.\n");
return;
}
loadCollection(
diff --git a/host/gl/glestranslator/GLcommon/SaveableTexture.cpp b/host/gl/glestranslator/GLcommon/SaveableTexture.cpp
index 4ecbf63..3092b2f 100644
--- a/host/gl/glestranslator/GLcommon/SaveableTexture.cpp
+++ b/host/gl/glestranslator/GLcommon/SaveableTexture.cpp
@@ -26,7 +26,6 @@
#include "aemu/base/files/StreamSerializing.h"
#include "aemu/base/system/System.h"
#include "gfxstream/host/logging.h"
-#include "host-common/crash_reporter.h"
#define SAVEABLE_TEXTURE_DEBUG 0
@@ -849,8 +848,7 @@
if (!m_globalTexObj) {
GFXSTREAM_DEBUG("SaveableTexture::%s: %p: could not allocate NamedObject for texture\n",
__func__, this);
- emugl::emugl_crash_reporter(
- "Fatal: could not allocate SaveableTexture m_globalTexObj\n");
+ GFXSTREAM_FATAL("Could not allocate SaveableTexture m_globalTexObj");
}
m_globalName = m_globalTexObj->getGlobalName();
diff --git a/host/include/render-utils/RenderLib.h b/host/include/render-utils/RenderLib.h
index c5984d5..d36c97b 100644
--- a/host/include/render-utils/RenderLib.h
+++ b/host/include/render-utils/RenderLib.h
@@ -17,7 +17,6 @@
#include "aemu/base/files/Stream.h"
#include "gfxstream/host/Features.h"
-#include "host-common/crash_reporter.h"
#include "host-common/dma_device.h"
#include "host-common/multi_display_agent.h"
#include "host-common/RefcountPipe.h"
@@ -68,7 +67,6 @@
// Get the GLES major/minor version determined by libOpenglRender.
virtual void getGlesVersion(int* maj, int* min) = 0;
virtual void setLogger(emugl_logger_struct logger) = 0;
- virtual void setCrashReporter(emugl_crash_reporter_t reporter) = 0;
virtual void setFeatureController(emugl_feature_is_enabled_t featureController) = 0;
virtual void setSyncDevice(emugl_sync_create_timeline_t,
emugl_sync_create_fence_t,
