gfxstream: nuke refreshHostConnection
Also:
- move HostConnectionType to HostConnection.h, and out
of EmulatorFeatureInfo.h
- Nuke unneeded mentions of render_control_t
BUG=311486792
TEST=compile
Change-Id: I162479991a81aa7bd91adc33ebdf4a0465e77f94
diff --git a/guest/OpenglSystemCommon/EmulatorFeatureInfo.h b/guest/OpenglSystemCommon/EmulatorFeatureInfo.h
index f7d32e1..90b989e 100644
--- a/guest/OpenglSystemCommon/EmulatorFeatureInfo.h
+++ b/guest/OpenglSystemCommon/EmulatorFeatureInfo.h
@@ -206,13 +206,6 @@
bool hasVulkanAuxCommandMemory; // This feature tracks if vulkan command buffers should be stored in an auxiliary shared memory
};
-enum HostConnectionType {
- HOST_CONNECTION_QEMU_PIPE = 1,
- HOST_CONNECTION_ADDRESS_SPACE = 2,
- HOST_CONNECTION_VIRTIO_GPU_PIPE = 3,
- HOST_CONNECTION_VIRTIO_GPU_ADDRESS_SPACE = 4,
-};
-
enum GrallocType {
GRALLOC_TYPE_RANCHU = 0,
GRALLOC_TYPE_MINIGBM = 1,
diff --git a/guest/OpenglSystemCommon/HostConnection.h b/guest/OpenglSystemCommon/HostConnection.h
index 228df4e..d0b6535 100644
--- a/guest/OpenglSystemCommon/HostConnection.h
+++ b/guest/OpenglSystemCommon/HostConnection.h
@@ -111,6 +111,13 @@
struct EGLThreadInfo;
+enum HostConnectionType {
+ HOST_CONNECTION_QEMU_PIPE = 1,
+ HOST_CONNECTION_ADDRESS_SPACE = 2,
+ HOST_CONNECTION_VIRTIO_GPU_PIPE = 3,
+ HOST_CONNECTION_VIRTIO_GPU_ADDRESS_SPACE = 4,
+};
+
class HostConnection
{
public:
diff --git a/guest/OpenglSystemCommon/ProcessPipe.cpp b/guest/OpenglSystemCommon/ProcessPipe.cpp
index 890a1cb..1c66d2a 100644
--- a/guest/OpenglSystemCommon/ProcessPipe.cpp
+++ b/guest/OpenglSystemCommon/ProcessPipe.cpp
@@ -189,12 +189,6 @@
sNeedInit = true;
}
-void refreshHostConnection() {
- HostConnection* hostConn = HostConnection::get();
- ExtendedRCEncoderContext* rcEnc = hostConn->rcEncoder();
- rcEnc->rcSetPuid(rcEnc, sProcUID);
-}
-
uint32_t* getSeqnoPtrForProcess() {
// It's assumed process pipe state has already been initialized.
return sSeqnoPtr;
diff --git a/guest/OpenglSystemCommon/ProcessPipe.h b/guest/OpenglSystemCommon/ProcessPipe.h
index cb0a44f..b17572e 100644
--- a/guest/OpenglSystemCommon/ProcessPipe.h
+++ b/guest/OpenglSystemCommon/ProcessPipe.h
@@ -15,9 +15,8 @@
//
#pragma once
-#include "EmulatorFeatureInfo.h"
-
#include <stdint.h>
+#include "HostConnection.h"
// The process pipe is used to notify the host about process exits,
// also associate all process-owned host GL resources with a process unique ID
@@ -31,8 +30,6 @@
//
// This is called when creating rcEncoder.
-struct renderControl_encoder_context_t;
-
extern bool processPipeInit(int stream_handle, HostConnectionType connType,
uint32_t noRenderControlEnc);
extern uint64_t getPuid();
@@ -40,7 +37,6 @@
// For testing purposes; this will close the current process pipe if opened, reset the state to
// initial, and open it again with the same parameters.
extern void processPipeRestart();
-extern void refreshHostConnection();
// Each process gets a sequence number field.
uint32_t* getSeqnoPtrForProcess();
