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

Merge "opengl translator: Mac fixes for unbind context"

Browse Source
This commit is contained in:
David Turner
2011-07-03 05:39:05 -07:00
committed by Android Code Review
parent 5b701a2972 25f01dda07
commit 2683b10bdd
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/emulator/opengl/host/libs/Translator/EGL/EglMacApi.cpp
View File

@@ -156,6 +156,17 @@ bool destroyContext(EGLNativeDisplayType dpy,EGLNativeContextType ctx) {
} }
bool makeCurrent(EGLNativeDisplayType dpy,EglSurface* read,EglSurface* draw,EGLNativeContextType ctx){ bool makeCurrent(EGLNativeDisplayType dpy,EglSurface* read,EglSurface* draw,EGLNativeContextType ctx){
// check for unbind
if (ctx == NULL && read == NULL && draw == NULL) {
nsWindowMakeCurrent(NULL, NULL);
return true;
}
else if (ctx == NULL || read == NULL || draw == NULL) {
// error !
return false;
}
//dont supporting diffrent read & draw surfaces on Mac //dont supporting diffrent read & draw surfaces on Mac
if(read->native() != draw->native()) return false; if(read->native() != draw->native()) return false;
switch(draw->type()){ switch(draw->type()){

9
tools/emulator/opengl/host/libs/Translator/EGL/MacNative.m
View File

@@ -60,12 +60,9 @@ void nsWindowMakeCurrent(void* context,void* nativeWin){
NSView* win = (NSView *)nativeWin; NSView* win = (NSView *)nativeWin;
if(ctx == nil){ if(ctx == nil){
[NSOpenGLContext clearCurrentContext]; [NSOpenGLContext clearCurrentContext];
} else { } else if (win != nil) {
if(win != nil){ [ctx setView: win];
[ctx clearDrawable]; [ctx makeCurrentContext];
[ctx setView: win];
[ctx makeCurrentContext];
}
} }
} }