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

Side by Side Diff: tools/gpu/gl/GLTestContext.cpp

Issue 2391113002: Use void* again for PlatformFence (Closed)
Patch Set: Use uint64_t for PlatformFence Created 4 years, 2 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 | « tools/gpu/FenceSync.h ('k') | tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.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 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GLTestContext.h" 8 #include "GLTestContext.h"
9 #include "gl/GrGLUtil.h" 9 #include "gl/GrGLUtil.h"
10 10
(...skipping 10 matching lines...) Expand all
21 private: 21 private:
22 GLFenceSync(const sk_gpu_test::GLTestContext*, const char* ext = ""); 22 GLFenceSync(const sk_gpu_test::GLTestContext*, const char* ext = "");
23 23
24 bool validate() { return fGLFenceSync && fGLClientWaitSync && fGLDeleteSync; } 24 bool validate() { return fGLFenceSync && fGLClientWaitSync && fGLDeleteSync; }
25 25
26 static constexpr GrGLenum GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117; 26 static constexpr GrGLenum GL_SYNC_GPU_COMMANDS_COMPLETE = 0x9117;
27 static constexpr GrGLenum GL_WAIT_FAILED = 0x911d; 27 static constexpr GrGLenum GL_WAIT_FAILED = 0x911d;
28 static constexpr GrGLbitfield GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001; 28 static constexpr GrGLbitfield GL_SYNC_FLUSH_COMMANDS_BIT = 0x00000001;
29 29
30 typedef struct __GLsync *GLsync; 30 typedef struct __GLsync *GLsync;
31 GR_STATIC_ASSERT(sizeof(GLsync) <= sizeof(sk_gpu_test::PlatformFence));
31 32
32 typedef GLsync (GR_GL_FUNCTION_TYPE* GLFenceSyncProc) (GrGLenum, GrGLbitfiel d); 33 typedef GLsync (GR_GL_FUNCTION_TYPE* GLFenceSyncProc) (GrGLenum, GrGLbitfiel d);
33 typedef GrGLenum (GR_GL_FUNCTION_TYPE* GLClientWaitSyncProc) (GLsync, GrGLbi tfield, GrGLuint64); 34 typedef GrGLenum (GR_GL_FUNCTION_TYPE* GLClientWaitSyncProc) (GLsync, GrGLbi tfield, GrGLuint64);
34 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GLDeleteSyncProc) (GLsync); 35 typedef GrGLvoid (GR_GL_FUNCTION_TYPE* GLDeleteSyncProc) (GLsync);
35 36
36 GLFenceSyncProc fGLFenceSync; 37 GLFenceSyncProc fGLFenceSync;
37 GLClientWaitSyncProc fGLClientWaitSync; 38 GLClientWaitSyncProc fGLClientWaitSync;
38 GLDeleteSyncProc fGLDeleteSync; 39 GLDeleteSyncProc fGLDeleteSync;
39 40
40 typedef FenceSync INHERITED; 41 typedef FenceSync INHERITED;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 GR_GL_NEAREST)); 139 GR_GL_NEAREST));
139 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_S, 140 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_S,
140 GR_GL_CLAMP_TO_EDGE)); 141 GR_GL_CLAMP_TO_EDGE));
141 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_T, 142 GR_GL_CALL(fGL, TexParameteri(GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_WRAP_T,
142 GR_GL_CLAMP_TO_EDGE)); 143 GR_GL_CLAMP_TO_EDGE));
143 GR_GL_CALL(fGL, TexImage2D(GR_GL_TEXTURE_RECTANGLE, 0, internalFormat, width , height, 0, 144 GR_GL_CALL(fGL, TexImage2D(GR_GL_TEXTURE_RECTANGLE, 0, internalFormat, width , height, 0,
144 externalFormat, externalType, data)); 145 externalFormat, externalType, data));
145 return id; 146 return id;
146 } 147 }
147 } // namespace sk_gpu_test 148 } // namespace sk_gpu_test
OLDNEW
« no previous file with comments | « tools/gpu/FenceSync.h ('k') | tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698