Merge "Synchronized glBufferData"

1 files changed, 9 insertions, 0 deletions

diff --git a/stream-servers/RenderControl.cpp b/stream-servers/RenderControl.cpp
index 186f4a17..8c6e2af2 100644
--- a/stream-servers/RenderControl.cpp
+++ b/stream-servers/RenderControl.cpp
@@ -232,6 +232,9 @@ static const char* kVulkanQueueSubmitWithCommands = "ANDROID_EMU_vulkan_queue_su
 // Batched descriptor set update
 static const char* kVulkanBatchedDescriptorSetUpdate = "ANDROID_EMU_vulkan_batched_descriptor_set_update";
 
+// Synchronized glBufferData call
+static const char* kSyncBufferData = "ANDROID_EMU_sync_buffer_data";
+
 static void rcTriggerWait(uint64_t glsync_ptr,
                           uint64_t thread_ptr,
                           uint64_t timeline);
@@ -477,6 +480,7 @@ static EGLint rcGetGLString(EGLenum name, void* buffer, EGLint bufferSize) {
     bool vulkanAsyncQueueSubmitEnabled = shouldEnableAsyncQueueSubmit();
     bool vulkanQueueSubmitWithCommands = shouldEnableQueueSubmitWithCommands();
     bool vulkanBatchedDescriptorSetUpdate = shouldEnableBatchedDescriptorSetUpdate();
+    bool syncBufferDataEnabled = true;
 
     if (isChecksumEnabled && name == GL_EXTENSIONS) {
         glStr += ChecksumCalculatorThreadInfo::getMaxVersionString();
@@ -600,6 +604,11 @@ static EGLint rcGetGLString(EGLenum name, void* buffer, EGLint bufferSize) {
         glStr += " ";
     }
 
+    if (syncBufferDataEnabled && name == GL_EXTENSIONS) {
+        glStr += kSyncBufferData;
+        glStr += " ";
+    }
+
     if (name == GL_EXTENSIONS) {
 
         GLESDispatchMaxVersion guestExtVer = GLES_DISPATCH_MAX_VERSION_2;