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

Side by Side Diff: src/gpu/gl/SkGLContext.cpp

Issue 1809733002: detach -> release (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: (C) Created 4 years, 9 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 | « src/gpu/gl/GrGLExtensions.cpp ('k') | src/gpu/gl/angle/SkANGLEGLContext.cpp » ('j') | 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 2013 Google Inc. 3 * Copyright 2013 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 #include "gl/SkGLContext.h" 8 #include "gl/SkGLContext.h"
9 #include "GrGLUtil.h" 9 #include "GrGLUtil.h"
10 #include "SkGpuFenceSync.h" 10 #include "SkGpuFenceSync.h"
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 ret->fGLClientWaitSync = reinterpret_cast<GLClientWaitSyncProc>( 133 ret->fGLClientWaitSync = reinterpret_cast<GLClientWaitSyncProc>(
134 ctx->onPlatformGetProcAddress("glClientWaitSyncAPPLE")); 134 ctx->onPlatformGetProcAddress("glClientWaitSyncAPPLE"));
135 ret->fGLDeleteSync = reinterpret_cast<GLDeleteSyncProc>( 135 ret->fGLDeleteSync = reinterpret_cast<GLDeleteSyncProc>(
136 ctx->onPlatformGetProcAddress("glDeleteSyncAPPLE")); 136 ctx->onPlatformGetProcAddress("glDeleteSyncAPPLE"));
137 } 137 }
138 138
139 if (!ret->fGLFenceSync || !ret->fGLClientWaitSync || !ret->fGLDeleteSync) { 139 if (!ret->fGLFenceSync || !ret->fGLClientWaitSync || !ret->fGLDeleteSync) {
140 return nullptr; 140 return nullptr;
141 } 141 }
142 142
143 return ret.detach(); 143 return ret.release();
144 } 144 }
145 145
146 SkPlatformGpuFence SkGLContext::GLFenceSync::insertFence() const { 146 SkPlatformGpuFence SkGLContext::GLFenceSync::insertFence() const {
147 return fGLFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0); 147 return fGLFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
148 } 148 }
149 149
150 bool SkGLContext::GLFenceSync::waitFence(SkPlatformGpuFence fence, bool flush) c onst { 150 bool SkGLContext::GLFenceSync::waitFence(SkPlatformGpuFence fence, bool flush) c onst {
151 GLsync glsync = static_cast<GLsync>(fence); 151 GLsync glsync = static_cast<GLsync>(fence);
152 return GL_WAIT_FAILED != fGLClientWaitSync(glsync, flush ? GL_SYNC_FLUSH_COM MANDS_BIT : 0, -1); 152 return GL_WAIT_FAILED != fGLClientWaitSync(glsync, flush ? GL_SYNC_FLUSH_COM MANDS_BIT : 0, -1);
153 } 153 }
(...skipping 23 matching lines...) Expand all
177 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_MIN_FIL TER, 177 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_MIN_FIL TER,
178 GR_GL_NEAREST)); 178 GR_GL_NEAREST));
179 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_S, 179 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_S,
180 GR_GL_CLAMP_TO_EDGE)); 180 GR_GL_CLAMP_TO_EDGE));
181 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_T, 181 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_T,
182 GR_GL_CLAMP_TO_EDGE)); 182 GR_GL_CLAMP_TO_EDGE));
183 GR_GL_CALL(fGL, TexImage2D(GR_GL_TEXTURE_RECTANGLE, 0, internalFormat, width , height, 0, 183 GR_GL_CALL(fGL, TexImage2D(GR_GL_TEXTURE_RECTANGLE, 0, internalFormat, width , height, 0,
184 externalFormat, externalType, data)); 184 externalFormat, externalType, data));
185 return id; 185 return id;
186 } 186 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLExtensions.cpp ('k') | src/gpu/gl/angle/SkANGLEGLContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698