9dcac079ce
On Mac it happens that when a context is bound to a pbuffer and you want to bind it to a window (NSView) instead you must release it from the pbuffer before binding the window by calling clearDrawable handle of NSOpenGLContext. This change added an override of NSOpenGLContext in order to track to which drawable type the context was previously bound and call clearDrawable when necessary. Change-Id: Iece5ab16a46aa0d107ccb773986a6b280d09d181
57 lines
1.6 KiB
Objective-C
57 lines
1.6 KiB
Objective-C
/*
|
|
* 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.
|
|
*/
|
|
#include "NativeSubWindow.h"
|
|
#include <Cocoa/Cocoa.h>
|
|
|
|
/*
|
|
* EmuGLView inherit from NSView and override the isOpaque
|
|
* method to return YES. That prevents drawing of underlying window/view
|
|
* when the view needs to be redrawn.
|
|
*/
|
|
@interface EmuGLView : NSView {
|
|
} @end
|
|
|
|
@implementation EmuGLView
|
|
|
|
- (BOOL)isOpaque {
|
|
return YES;
|
|
}
|
|
|
|
@end
|
|
|
|
|
|
EGLNativeWindowType createSubWindow(FBNativeWindowType p_window,
|
|
EGLNativeDisplayType* display_out,
|
|
int x, int y,int width, int height){
|
|
NSRect contentRect = NSMakeRect(x, y, width, height);
|
|
NSView *glView = [[EmuGLView alloc] initWithFrame:contentRect];
|
|
if (glView) {
|
|
NSWindow *win = (NSWindow *)p_window;
|
|
[[win contentView] addSubview:glView];
|
|
[win makeKeyAndOrderFront:nil];
|
|
}
|
|
|
|
return (EGLNativeWindowType)glView;
|
|
}
|
|
|
|
void destroySubWindow(EGLNativeDisplayType dis,EGLNativeWindowType win){
|
|
if(win){
|
|
NSView *glView = (NSView *)win;
|
|
[glView removeFromSuperview];
|
|
[glView release];
|
|
}
|
|
}
|