5d7f0875e9
This patch modifies the guest encoding libraries to avoid un-necessary copies when sending large buffers (e.g. pixels) to the host. Instead, the data is sent directly through a new IOStream method (writeFully()). On my machine, this improves the NenaMark2 benchmark (from 50.8 to 57.1 fps). More importantly, this speeds up the display of non-GL surfaces too, which are sent through the special rcUpdateColorBuffer() function in gralloc_goldfish. This is noticeable in many parts of the UI (e.g. when scrolling through lists). To tag a given parameter, use the new 'isLarge' variable flag in the protocol .attrib file. Implemented for the following encoding functions: rcUpdateColorBuffer glTexSubImage2D glTexImage2Di glBufferData glBufferSubData glCompressedTexImage2D glCompressedTexSubImage2D glTexImage3DOES glTexSubImage3DOES glCompressedTexImage3DOES glCompressedTexSubImage3DOES + Optimize the auto-generated encoder functions to avoid repeated function calls (for size computations). Change-Id: I13a02607b606c40cd05984cd2051b1f3424bc2d0
103 lines
2.6 KiB
C++
103 lines
2.6 KiB
C++
/*
|
|
* Copyright (C) 2011 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
#ifndef __IO_STREAM_H__
|
|
#define __IO_STREAM_H__
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
|
|
#include "ErrorLog.h"
|
|
|
|
class IOStream {
|
|
public:
|
|
|
|
IOStream(size_t bufSize) {
|
|
m_buf = NULL;
|
|
m_bufsize = bufSize;
|
|
m_free = 0;
|
|
}
|
|
|
|
virtual void *allocBuffer(size_t minSize) = 0;
|
|
virtual int commitBuffer(size_t size) = 0;
|
|
virtual const unsigned char *readFully( void *buf, size_t len) = 0;
|
|
virtual const unsigned char *read( void *buf, size_t *inout_len) = 0;
|
|
virtual int writeFully(const void* buf, size_t len) = 0;
|
|
|
|
virtual ~IOStream() {
|
|
|
|
// NOTE: m_buf is 'owned' by the child class thus we expect it to be released by it
|
|
}
|
|
|
|
unsigned char *alloc(size_t len) {
|
|
|
|
if (m_buf && len > m_free) {
|
|
if (flush() < 0) {
|
|
ERR("Failed to flush in alloc\n");
|
|
return NULL; // we failed to flush so something is wrong
|
|
}
|
|
}
|
|
|
|
if (!m_buf || len > m_bufsize) {
|
|
int allocLen = m_bufsize < len ? len : m_bufsize;
|
|
m_buf = (unsigned char *)allocBuffer(allocLen);
|
|
if (!m_buf) {
|
|
ERR("Alloc (%u bytes) failed\n", allocLen);
|
|
return NULL;
|
|
}
|
|
m_bufsize = m_free = allocLen;
|
|
}
|
|
|
|
unsigned char *ptr;
|
|
|
|
ptr = m_buf + (m_bufsize - m_free);
|
|
m_free -= len;
|
|
|
|
return ptr;
|
|
}
|
|
|
|
int flush() {
|
|
|
|
if (!m_buf || m_free == m_bufsize) return 0;
|
|
|
|
int stat = commitBuffer(m_bufsize - m_free);
|
|
m_buf = NULL;
|
|
m_free = 0;
|
|
return stat;
|
|
}
|
|
|
|
const unsigned char *readback(void *buf, size_t len) {
|
|
flush();
|
|
return readFully(buf, len);
|
|
}
|
|
|
|
|
|
private:
|
|
unsigned char *m_buf;
|
|
size_t m_bufsize;
|
|
size_t m_free;
|
|
};
|
|
|
|
//
|
|
// When a client opens a connection to the renderer, it should
|
|
// send unsigned int value indicating the "clientFlags".
|
|
// The following are the bitmask of the clientFlags.
|
|
// currently only one bit is used which flags the server
|
|
// it should exit.
|
|
//
|
|
#define IOSTREAM_CLIENT_EXIT_SERVER 1
|
|
|
|
#endif
|