AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes to get SampleApp's OpenGL path not to crash on Linux. Initialize

Browse Source 
SkOSWindow::fGLAttched (and fVi while we're at it), since it was being checked
uninitialized.  Don't call has_gl_extension() while initializing the
GrGLDefaultInterface, since it derefs the default interface (which is still
NULL); use has_gl_extension_from_string() instead.

Review URL:  http://codereview.appspot.com/4480041/



git-svn-id: http://skia.googlecode.com/svn/trunk@1242 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2011-05-04 15:29:04 +00:00
parent 4b9b6a20d4
commit 2dbd0449bf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gpu/src/unix/GrGLDefaultInterface_unix.cpp
View File

@ -136,7 +136,8 @@ void GrGLSetDefaultGLInterface() {
// First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since
// GL_ARB_framebuffer_object doesn't use ARB suffix.)
if (major >= 3 || has_gl_extension("GL_ARB_framebuffer_object")) {
if (major >= 3 || has_gl_extension_from_string(
"GL_ARB_framebuffer_object", extString)) {
GR_GL_GET_PROC(GenFramebuffers);
GR_GL_GET_PROC(BindFramebuffer);
GR_GL_GET_PROC(FramebufferTexture2D);

2
src/utils/unix/SkOSWindow_Unix.cpp
View File

@ -25,7 +25,7 @@ const int HEIGHT = 1000;
const long EVENT_MASK = StructureNotifyMask|ButtonPressMask|ButtonReleaseMask
|ExposureMask|PointerMotionMask|KeyPressMask|KeyReleaseMask;
SkOSWindow::SkOSWindow(void* unused)
SkOSWindow::SkOSWindow(void* unused) : fGLAttached(false), fVi(0)
{
fUnixWindow.fDisplay = XOpenDisplay(NULL);
Display* dsp = fUnixWindow.fDisplay;