diff options
author | 2012-08-23 18:09:54 +0000 | |
---|---|---|
committer | 2012-08-23 18:09:54 +0000 | |
commit | fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (patch) | |
tree | d8b4815d15946c32ee9d254e932411e93be942bb /src/gpu/gl/mesa | |
parent | 2abed834789bb64c7da740df4c47efc142b7311a (diff) |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054
git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/mesa')
-rw-r--r-- | src/gpu/gl/mesa/SkMesaGLContext.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gpu/gl/mesa/SkMesaGLContext.cpp b/src/gpu/gl/mesa/SkMesaGLContext.cpp index b7d220cfb9..cac021c170 100644 --- a/src/gpu/gl/mesa/SkMesaGLContext.cpp +++ b/src/gpu/gl/mesa/SkMesaGLContext.cpp @@ -16,13 +16,13 @@ SkMesaGLContext::AutoContextRestore::AutoContextRestore() { if (NULL != (OSMesaContext)fOldContext) { OSMesaGetColorBuffer((OSMesaContext)fOldContext, &fOldWidth, &fOldHeight, - &fOldFormat, &fOldImage); + &fOldFormat, &fOldImage); } } SkMesaGLContext::AutoContextRestore::~AutoContextRestore() { if (NULL != (OSMesaContext)fOldContext) { - OSMesaMakeCurrent((OSMesaContext)fOldContext, fOldImage, + OSMesaMakeCurrent((OSMesaContext)fOldContext, fOldImage, fOldFormat, fOldWidth, fOldHeight); } } @@ -43,7 +43,7 @@ void SkMesaGLContext::destroyGLContext() { if (fImage) { sk_free(fImage); } - + if (fContext) { OSMesaDestroyContext((OSMesaContext)fContext); } @@ -72,18 +72,18 @@ const GrGLInterface* SkMesaGLContext::createGLContext() { this->destroyGLContext(); return NULL; } - + // Bind the buffer to the context and make it current - if (!OSMesaMakeCurrent((OSMesaContext)fContext, - fImage, - GR_GL_UNSIGNED_BYTE, - gBOGUS_SIZE, + if (!OSMesaMakeCurrent((OSMesaContext)fContext, + fImage, + GR_GL_UNSIGNED_BYTE, + gBOGUS_SIZE, gBOGUS_SIZE)) { SkDebugf("OSMesaMakeCurrent failed!\n"); this->destroyGLContext(); return NULL; } - + const GrGLInterface* interface = GrGLCreateMesaInterface(); if (!interface) { SkDebugf("Could not create GL interface!\n"); @@ -91,12 +91,12 @@ const GrGLInterface* SkMesaGLContext::createGLContext() { return NULL; } return interface; - + } void SkMesaGLContext::makeCurrent() const { if (fContext) { - if (!OSMesaMakeCurrent((OSMesaContext)fContext, fImage, + if (!OSMesaMakeCurrent((OSMesaContext)fContext, fImage, GR_GL_UNSIGNED_BYTE, gBOGUS_SIZE, gBOGUS_SIZE)) { SkDebugf("Could not make MESA context current."); } |