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

am b5f5dce4: Merge " small changes to the code before the commit for supporting windows os"

Browse Source 
* commit 'b5f5dce4c722e797d9acbfaea24123dfbc58a82b':
  small changes to the code before the commit for supporting windows os
This commit is contained in:
David Turner
2011-05-16 07:15:39 -07:00
committed by Android Git Automerger
parent 7ff5173573 b5f5dce4c7
commit 41709da80e
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/emulator/opengl/host/libs/Translator/EGL/EglContext.cpp
View File

@@ -31,7 +31,7 @@ m_draw(NULL),
m_destroy(false), m_destroy(false),
m_version(ver) m_version(ver)
{ {
m_shareGroup = shared_context.Ptr()? m_shareGroup = shared_context.Ptr()?
mngr->attachShareGroup(context,shared_context.Ptr()->getShareGroup().Ptr()): mngr->attachShareGroup(context,shared_context.Ptr()->getShareGroup().Ptr()):
mngr->createShareGroup(context); mngr->createShareGroup(context);
m_hndl = ++s_nextContextHndl; m_hndl = ++s_nextContextHndl;

1
tools/emulator/opengl/host/libs/Translator/EGL/EglX11Api.cpp
View File

@@ -144,7 +144,6 @@ void queryConfigs(EGLNativeDisplayType dpy,ConfigsList& listOut) {
EglConfig* conf = pixelFormatToConfig(dpy,&frmtList[i]); EglConfig* conf = pixelFormatToConfig(dpy,&frmtList[i]);
if(conf) listOut.push_back(conf); if(conf) listOut.push_back(conf);
} }
listOut.sort();
XFree(frmtList); XFree(frmtList);
} }

4
tools/emulator/opengl/host/libs/Translator/GLES_CM/GLEScontext.cpp
View File

@@ -53,6 +53,7 @@ void GLEScontext::init() {
android::Mutex::Autolock mutex(s_lock); android::Mutex::Autolock mutex(s_lock);
if(!m_initialized) { if(!m_initialized) {
int maxTexUnits; int maxTexUnits;
s_glDispatch.dispatchFuncs();
s_glDispatch.glGetIntegerv(GL_MAX_CLIP_PLANES,&s_glSupport.maxClipPlane); s_glDispatch.glGetIntegerv(GL_MAX_CLIP_PLANES,&s_glSupport.maxClipPlane);
s_glDispatch.glGetIntegerv(GL_MAX_LIGHTS,&s_glSupport.maxLights); s_glDispatch.glGetIntegerv(GL_MAX_LIGHTS,&s_glSupport.maxLights);
s_glDispatch.glGetIntegerv(GL_MAX_TEXTURE_SIZE,&s_glSupport.maxTexSize); s_glDispatch.glGetIntegerv(GL_MAX_TEXTURE_SIZE,&s_glSupport.maxTexSize);
@@ -67,7 +68,6 @@ void GLEScontext::init() {
GLEScontext::GLEScontext():m_glError(GL_NO_ERROR),m_activeTexture(0),m_arrayBuffer(0),m_elementBuffer(0),m_pointsIndex(-1),m_initialized(false) { GLEScontext::GLEScontext():m_glError(GL_NO_ERROR),m_activeTexture(0),m_arrayBuffer(0),m_elementBuffer(0),m_pointsIndex(-1),m_initialized(false) {
s_glDispatch.dispatchFuncs();
m_map[GL_COLOR_ARRAY] = new GLESpointer(); m_map[GL_COLOR_ARRAY] = new GLESpointer();
m_map[GL_NORMAL_ARRAY] = new GLESpointer(); m_map[GL_NORMAL_ARRAY] = new GLESpointer();
@@ -469,7 +469,7 @@ GLuint GLEScontext::getBuffer(GLenum target) {
GLvoid* GLEScontext::getBindedBuffer(GLenum target) { GLvoid* GLEScontext::getBindedBuffer(GLenum target) {
GLuint bufferName = getBuffer(target); GLuint bufferName = getBuffer(target);
if(!bufferName) return NULL; if(!bufferName) return NULL;
GLESbuffer* vbo = static_cast<GLESbuffer*>(m_shareGroup->getObjectData(VERTEXBUFFER,bufferName).Ptr()); GLESbuffer* vbo = static_cast<GLESbuffer*>(m_shareGroup->getObjectData(VERTEXBUFFER,bufferName).Ptr());
return vbo->getData(); return vbo->getData();
} }