Move emulator GLES from development.git to sdk.git
The emulator GLES support has two interfaces: a host shared library interface used by QEMU, and a protocol between the platform and the host. The host library interface is not versioned; QEMU and the GLES renderer must match. The protocol on the other hand must be backwards compatible: a new GLES renderer must support an older platform image. Thus for branching purposes it makes more sense to put the GLES renderer in sdk.git, which is branched along with qemu.git for SDK releases. Platform images will be built against the protocol version in the platform branch of sdk.git. Change-Id: Ie73fce12815c9740e27d0f56caa53c6ceb3d30cc
This commit is contained in:
committed by
Jean-Baptiste Queru
parent
46ead86b02
commit
80d4ba7716
@@ -1,71 +0,0 @@
|
||||
/*
|
||||
* 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 _OSUTILS_DYN_LIBRARY_H
|
||||
#define _OSUTILS_DYN_LIBRARY_H
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
namespace osUtils {
|
||||
|
||||
typedef void (*dynFuncPtr)(void);
|
||||
|
||||
class dynLibrary
|
||||
{
|
||||
public:
|
||||
static dynLibrary *open(const char *p_libName);
|
||||
~dynLibrary();
|
||||
|
||||
dynFuncPtr findSymbol(const char *p_symName);
|
||||
|
||||
private:
|
||||
dynLibrary();
|
||||
|
||||
private:
|
||||
#ifdef _WIN32
|
||||
HMODULE m_lib;
|
||||
#else
|
||||
void *m_lib;
|
||||
#endif
|
||||
};
|
||||
|
||||
} // of namespace osUtils
|
||||
|
||||
|
||||
|
||||
// Macro to compose emugl shared library name under various OS and bitness
|
||||
// eg.
|
||||
// on x86_64, EMUGL_LIBNAME("foo") --> "lib64foo.so"
|
||||
|
||||
#ifdef _WIN32
|
||||
# define DLL_EXTENSION "" // _WIN32 LoadLibrary only accept name w/o .dll extension
|
||||
#elif defined(__APPLE__)
|
||||
# define DLL_EXTENSION ".dylib"
|
||||
#else
|
||||
# define DLL_EXTENSION ".so"
|
||||
#endif
|
||||
|
||||
#if defined(__x86_64__)
|
||||
# define EMUGL_LIBNAME(name) "lib64" name DLL_EXTENSION
|
||||
#elif defined(__i386__)
|
||||
# define EMUGL_LIBNAME(name) "lib" name DLL_EXTENSION
|
||||
#else
|
||||
/* This header is included by target w/o using EMUGL_LIBNAME(). Don't #error, leave it undefined */
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user