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

am dc84793a: Merge "opengles emulator: object name manager name generation"

Browse Source 
* commit 'dc84793a6ac48d74fd02af6404367e3de76ef25a':
  opengles emulator: object name manager name generation
This commit is contained in:
David Turner
2011-08-10 01:54:03 -07:00
committed by Android Git Automerger
parent 2257c1fd9f dc84793a6a
commit 2cd8a6d916
2 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tools/emulator/opengl/host/libs/Translator/GLcommon/objectNameManager.cpp
View File

@@ -15,6 +15,7 @@
*/ */
#include <map> #include <map>
#include <GLcommon/objectNameManager.h> #include <GLcommon/objectNameManager.h>
#include <GLcommon/GLEScontext.h>
NameSpace::NameSpace(NamedObjectType p_type, GlobalNameSpace *globalNameSpace) : NameSpace::NameSpace(NamedObjectType p_type, GlobalNameSpace *globalNameSpace) :
@@ -105,6 +106,50 @@ NameSpace::replaceGlobalName(ObjectLocalName p_localName, unsigned int p_globalN
} }
} }
GlobalNameSpace::GlobalNameSpace()
{
mutex_init(&m_lock);
}
GlobalNameSpace::~GlobalNameSpace()
{
mutex_destroy(&m_lock);
}
unsigned int
GlobalNameSpace::genName(NamedObjectType p_type)
{
if ( p_type >= NUM_OBJECT_TYPES ) return 0;
unsigned int name = 0;
mutex_lock(&m_lock);
switch (p_type) {
case VERTEXBUFFER:
GLEScontext::dispatcher().glGenBuffers(1,&name);
break;
case TEXTURE:
GLEScontext::dispatcher().glGenTextures(1,&name);
break;
case RENDERBUFFER:
GLEScontext::dispatcher().glGenRenderbuffersEXT(1,&name);
break;
case FRAMEBUFFER:
GLEScontext::dispatcher().glGenFramebuffersEXT(1,&name);
break;
case SHADER: //objects in shader namepace are not handled
default:
name = 0;
}
mutex_unlock(&m_lock);
return name;
}
void
GlobalNameSpace::deleteName(NamedObjectType p_type, unsigned int p_name)
{
}
typedef std::pair<NamedObjectType, ObjectLocalName> ObjectIDPair; typedef std::pair<NamedObjectType, ObjectLocalName> ObjectIDPair;
typedef std::map<ObjectIDPair, ObjectDataPtr> ObjectDataMap; typedef std::map<ObjectIDPair, ObjectDataPtr> ObjectDataMap;

43
tools/emulator/opengl/host/libs/Translator/include/GLcommon/objectNameManager.h
View File

@@ -118,48 +118,13 @@ private:
class GlobalNameSpace class GlobalNameSpace
{ {
public: public:
GlobalNameSpace() GlobalNameSpace();
{ ~GlobalNameSpace();
mutex_init(&m_lock); unsigned int genName(NamedObjectType p_type);
void deleteName(NamedObjectType p_type, unsigned int p_name);
for (int i=0; i<NUM_OBJECT_TYPES; i++) {
m_nameSpace[i] = new NameSpace((NamedObjectType)i, NULL);
}
}
~GlobalNameSpace()
{
mutex_lock(&m_lock);
for (int i=0; i<NUM_OBJECT_TYPES; i++) {
delete m_nameSpace[i];
}
mutex_unlock(&m_lock);
mutex_destroy(&m_lock);
}
unsigned int genName(NamedObjectType p_type)
{
if ( p_type >= NUM_OBJECT_TYPES ) return 0;
mutex_lock(&m_lock);
unsigned int name = m_nameSpace[p_type]->genName(0, false,true);
mutex_unlock(&m_lock);
return name;
}
void deleteName(NamedObjectType p_type, unsigned int p_name)
{
if ( p_type >= NUM_OBJECT_TYPES ) return;
mutex_lock(&m_lock);
m_nameSpace[p_type]->deleteName(p_name);
mutex_unlock(&m_lock);
}
private: private:
mutex_t m_lock; mutex_t m_lock;
NameSpace *m_nameSpace[NUM_OBJECT_TYPES];
}; };
// //