LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 4e9cf45c: am 891ad0e8: Merge "emulator: opengl: Make render_api.h C-compatible"

Browse Source 
* commit '4e9cf45cbda52fb04e77f7917eb1abb31ff1b851':
  emulator: opengl: Make render_api.h C-compatible
This commit is contained in:
David 'Digit' Turner
2011-08-05 09:42:55 -07:00
committed by Android Git Automerger
parent 3374f8ad2c 4e9cf45cbd
commit 44d6a0fa6f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/emulator/opengl/host/include/libOpenglRender/render_api.h
View File

@@ -16,7 +16,10 @@
#ifndef _OPENGL_RENDERER_RENDER_API_H #ifndef _OPENGL_RENDERER_RENDER_API_H
#define _OPENGL_RENDERER_RENDER_API_H #define _OPENGL_RENDERER_RENDER_API_H
#include "IOStream.h" #ifdef __cplusplus
extern "C" {
#endif
#include "render_api_platform_types.h" #include "render_api_platform_types.h"
// //
@@ -41,14 +44,8 @@ bool initOpenGLRenderer(FBNativeWindowType window,
// //
bool stopOpenGLRenderer(); bool stopOpenGLRenderer();
// #ifdef __cplusplus
// createRenderThread - opens a new communication channel to the renderer }
// process and creates new rendering thread. #endif
// returns a pointer to IOStream through which command tokens are being sent
// to the render thread for execution. 'p_stream_buffer_size' is the internal
// stream buffer size.
// The thread is destroyed when deleting the IOStream object.
//
IOStream *createRenderThread(int p_stream_buffer_size);
#endif #endif

3
tools/emulator/opengl/host/libs/libOpenglRender/render_api.cpp
View File

@@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include "libOpenglRender/render_api.h" #include "libOpenglRender/render_api.h"
#include "IOStream.h"
#include "FrameBuffer.h" #include "FrameBuffer.h"
#include "RenderServer.h" #include "RenderServer.h"
#include "osProcess.h" #include "osProcess.h"
@@ -23,6 +24,8 @@ static osUtils::childProcess *s_renderProc = NULL;
static RenderServer *s_renderThread = NULL; static RenderServer *s_renderThread = NULL;
static int s_renderPort = 0; static int s_renderPort = 0;
static IOStream *createRenderThread(int p_stream_buffer_size);
#ifdef __APPLE__ #ifdef __APPLE__
#define RENDER_API_USE_THREAD #define RENDER_API_USE_THREAD
#endif #endif