Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: src/gpu/gl/mesa/SkMesaGLContext.cpp

Issue 1306753006: nullptr isn't an int; this is what we want (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include <GL/osmesa.h> 9 #include <GL/osmesa.h>
10 10
11 #include "gl/mesa/SkMesaGLContext.h" 11 #include "gl/mesa/SkMesaGLContext.h"
12 #include "gl/GrGLDefines.h" 12 #include "gl/GrGLDefines.h"
13 13
14 static const GrGLint gBOGUS_SIZE = 16; 14 static const GrGLint gBOGUS_SIZE = 16;
15 15
16 SkMesaGLContext::SkMesaGLContext() 16 SkMesaGLContext::SkMesaGLContext()
17 : fContext(static_cast<Context>(nullptr)) 17 : fContext(static_cast<Context>(0))
18 , fImage(nullptr) { 18 , fImage(nullptr) {
19 GR_STATIC_ASSERT(sizeof(Context) == sizeof(OSMesaContext)); 19 GR_STATIC_ASSERT(sizeof(Context) == sizeof(OSMesaContext));
20 20
21 /* Create an RGBA-mode context */ 21 /* Create an RGBA-mode context */
22 #if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305 22 #if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
23 /* specify Z, stencil, accum sizes */ 23 /* specify Z, stencil, accum sizes */
24 fContext = (Context)OSMesaCreateContextExt(OSMESA_BGRA, 0, 0, 0, nullptr); 24 fContext = (Context)OSMesaCreateContextExt(OSMESA_BGRA, 0, 0, 0, nullptr);
25 #else 25 #else
26 fContext = (Context)OSMesaCreateContext(OSMESA_BGRA, nullptr); 26 fContext = (Context)OSMesaCreateContext(OSMESA_BGRA, nullptr);
27 #endif 27 #endif
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 } 72 }
73 73
74 void SkMesaGLContext::destroyGLContext() { 74 void SkMesaGLContext::destroyGLContext() {
75 if (fImage) { 75 if (fImage) {
76 sk_free(fImage); 76 sk_free(fImage);
77 fImage = nullptr; 77 fImage = nullptr;
78 } 78 }
79 79
80 if (fContext) { 80 if (fContext) {
81 OSMesaDestroyContext((OSMesaContext)fContext); 81 OSMesaDestroyContext((OSMesaContext)fContext);
82 fContext = static_cast<Context>(nullptr); 82 fContext = static_cast<Context>(0);
83 } 83 }
84 } 84 }
85 85
86 86
87 87
88 void SkMesaGLContext::onPlatformMakeCurrent() const { 88 void SkMesaGLContext::onPlatformMakeCurrent() const {
89 if (fContext) { 89 if (fContext) {
90 if (!OSMesaMakeCurrent((OSMesaContext)fContext, fImage, 90 if (!OSMesaMakeCurrent((OSMesaContext)fContext, fImage,
91 GR_GL_UNSIGNED_BYTE, gBOGUS_SIZE, gBOGUS_SIZE)) { 91 GR_GL_UNSIGNED_BYTE, gBOGUS_SIZE, gBOGUS_SIZE)) {
92 SkDebugf("Could not make MESA context current."); 92 SkDebugf("Could not make MESA context current.");
93 } 93 }
94 } 94 }
95 } 95 }
96 96
97 void SkMesaGLContext::onPlatformSwapBuffers() const { } 97 void SkMesaGLContext::onPlatformSwapBuffers() const { }
98 98
99 GrGLFuncPtr SkMesaGLContext::onPlatformGetProcAddress(const char* procName) cons t { 99 GrGLFuncPtr SkMesaGLContext::onPlatformGetProcAddress(const char* procName) cons t {
100 return OSMesaGetProcAddress(procName); 100 return OSMesaGetProcAddress(procName);
101 } 101 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698